diff --git a/ChangeLog b/ChangeLog
index 0b2b5350e..b9d410df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-16  Robert Millan  <rmh@aybabtu.com>
+
+	* util/grub-mkdevicemap.c (make_device_map): Iterate up to 20 for
+	IDE disk check, since Linux is known to support 20 IDE disks.
+	Reported by Colin Watson.
+
 2007-12-15  Bean  <bean123ch@gmail.com>
 
 	* conf/i386-pc.rmk (pkgdata_IMAGES): Add lnxboot.img.
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index 1e7f77825..ceaab4b27 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -417,7 +417,7 @@ make_device_map (const char *device_map, int floppy_disks)
 #endif /* __linux__ */
     
   /* IDE disks.  */
-  for (i = 0; i < 8; i++)
+  for (i = 0; i < 20; i++)
     {
       char name[16];