diff --git a/ChangeLog b/ChangeLog
index 843056669..42100ed78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-04  Robert Millan  <rmh@gnu.org>
+
+	* util/deviceiter.c (grub_util_iterate_devices): Increase SCSI
+	limit to 48 (to cope with Sun Fire X4500), and IDE limit to 96
+	(its SATA disks are detected as slaveless IDE master drives on
+	kFreeBSD).
+	Reported by Carsten Aulbert.
+
 2010-11-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/bin2h.c (main): Fix spelling error in generated output.
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 1cf511934..34d34b7bb 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -601,7 +601,7 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 #endif /* __linux__ */
 
   /* IDE disks.  */
-  for (i = 0; i < 26; i++)
+  for (i = 0; i < 96; i++)
     {
       char name[16];
 
@@ -655,7 +655,7 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 #endif /* __linux__ */
 
   /* The rest is SCSI disks.  */
-  for (i = 0; i < 26; i++)
+  for (i = 0; i < 48; i++)
     {
       char name[16];