diff --git a/ChangeLog b/ChangeLog
index 2ef74c20f..685d081dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-16  Robert Millan  <rmh@aybabtu.com>
+
+	* util/biosdisk.c (convert_system_partition_to_system_disk): Detect
+	I2O devices.
+	Patch from Sven Mueller <sven@debian.org>.
+
 2008-06-16  Robert Millan  <rmh@aybabtu.com>
 
 	* util/update-grub.in: Check for $EUID instead of $UID.
diff --git a/util/biosdisk.c b/util/biosdisk.c
index 90df4f1ef..d78a69f77 100644
--- a/util/biosdisk.c
+++ b/util/biosdisk.c
@@ -657,6 +657,14 @@ convert_system_partition_to_system_disk (const char *os_dev)
 	  return path;
 	}
       
+      /* If this is an I2O disk.  */
+      if (strncmp ("i2o/hd", p, sizeof ("i2o/hd") - 1) == 0)
+      	{
+	  /* /dev/i2o/hd[a-z]([0-9]+)? */
+	  p[sizeof ("i2o/hda") - 1] = '\0';
+	  return path;
+	}
+      
       /* If this is a MultiMediaCard (MMC).  */
       if (strncmp ("mmcblk", p, sizeof ("mmcblk") - 1) == 0)
 	{