diff --git a/ChangeLog b/ChangeLog
index 6c8b60da2..685934009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-06  Felix Zielcke  <fzielcke@z-51.de>
+
+	* disk/raid.c (insert_array): Set `array->chunk_size' to 64 for
+	RAID level 1.
+
 2008-09-06  Felix Zielcke  <fzielcke@z-51.de>
 
 	* fs/iso9660.c (grub_iso9660_date): New structure.
diff --git a/disk/raid.c b/disk/raid.c
index 3dab0d802..62cbcb5ba 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -575,6 +575,11 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       /* Add our new array to the list.  */
       array->next = array_list;
       array_list = array;
+
+      /* RAID 1 doestn't use a chunksize but code assumes one so set
+	 one. */
+      if (array->level == 1)
+	array->chunk_size = 64;
     }
 
   /* Add the device to the array. */