diff --git a/ChangeLog b/ChangeLog
index d7a69ef8b..4a40c401a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-11  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* util/grub-install.in (convert): When $host_os is linux*, use
+	the expression 's%\([sh]d[a-z]\)[0-9]*$%\1%' instead of
+	's%[0-9]*$%%', to get rid of the partition part. This fixes the
+	bug "/dev/fd0" -> "/dev/fd". (But don't you think the naming is
+	quite inconsistent with hard disks? Why not /dev/fd[a-z]?)
+	Report by Pavel Roskin.
+	
 2000-06-08  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* docs/tutorial.texi (Network): The body is moved to ...
diff --git a/util/grub-install.in b/util/grub-install.in
index b6d46a719..ef2cae2d1 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -73,7 +73,7 @@ convert () {
     # Break the device name into the disk part and the partition part.
     case "$host_os" in
     linux*)
-	tmp_disk=`echo "$1" | sed 's%[0-9]*$%%'`
+	tmp_disk=`echo "$1" | sed 's%\([sh]d[a-z]\)[0-9]*$%\1%'`
 	tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%s[0-9]*[a-g]?%%'`