diff --git a/ChangeLog b/ChangeLog
index f28b1455a..02665d09b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-28  Robert Millan  <rmh@aybabtu.com>
+
+	* disk/raid.c (grub_raid_scan_device): Do not abort when two disks
+	with the same number are found, just use issue a warning with
+	grub_dprintf(), as this error has been reported to be non-fatal.
+	
 2008-07-27  Robert Millan  <rmh@aybabtu.com>
 
 	* disk/ata.c (grub_ata_dumpinfo): Use grub_dprintf() for debugging
diff --git a/disk/raid.c b/disk/raid.c
index a484fcf89..731bf1f43 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -442,16 +442,10 @@ grub_raid_scan_device (const char *name)
 	}
   
       if (array->device[sb.this_disk.number] != NULL)
-	{
-	  /* We found multiple devices with the same number. Again,
-	     this shouldn't happen.*/
-
-	  grub_error (GRUB_ERR_BAD_NUMBER,
-		      "Found two disks with the number %d?!?",
+	/* We found multiple devices with the same number. Again,
+	   this shouldn't happen.*/
+	grub_dprintf ("raid", "Found two disks with the number %d?!?",
 		      sb.this_disk.number);
-
-	  return 0;
-	}
     }
 
   /* Add an array to the list if we didn't find any.  */