diff --git a/ChangeLog b/ChangeLog
index 8895d8db0..3f836f3d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-09  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From Leendert Meyer <leen.meyer@home.nl>:
+	* util/grub-install.in (convert): If a floppy device is
+	specified, remove everything from $tmp_part.
+	
 2000-12-09  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* lib/device.c [__linux__] (write_to_partition): Use strcpy
diff --git a/THANKS b/THANKS
index 322f454be..eca1f9a16 100644
--- a/THANKS
+++ b/THANKS
@@ -35,6 +35,7 @@ Kalle Olavi Niemitalo <tosi@ees2.oulu.fi>
 Khimenko Victor <grub@khim.sch57.msk.ru>
 Klaus Reichl <klaus.reichl@alcatel.at>
 Kunihiro Ishiguro <kunihiro@zebra.org>
+Leendert Meyer <leen.meyer@home.nl>
 M. Meiarashi <mes@st.rim.or.jp>
 Mark Lundeberg <aa026@pgfn.bc.ca>
 Matt Yourst <yourst@mit.edu>
diff --git a/util/grub-install.in b/util/grub-install.in
index f5e5c9e6e..ad5bd7c55 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -80,6 +80,8 @@ convert () {
 				  -e 's%/part[0-9]*$%/disc%'`
 	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'`
+	# floppy drives don't have partitions:
+	tmp_part=`echo "$tmp_part" | sed -e 's%.*/fd[0-9]*%%'`
 	;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`