diff --git a/ChangeLog b/ChangeLog
index 52bd2608d..f8813f259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/raid6_recover.c (grub_raid6_recover): Get start_sector
+	for the right device.
+
 2011-11-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/kernel.h (grub_module_header): Make type into uint32 as
diff --git a/grub-core/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c
index 25b50eb6b..54dc612ee 100644
--- a/grub-core/disk/raid6_recover.c
+++ b/grub-core/disk/raid6_recover.c
@@ -122,7 +122,7 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p,
         {
           if ((array->members[pos].device) &&
               (! grub_disk_read (array->members[pos].device,
-				 array->members[i].start_sector + sector,
+				 array->members[pos].start_sector + sector,
 				 0, size, buf)))
             {
               grub_raid_block_xor (pbuf, buf, size);
@@ -154,7 +154,7 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p,
       /* One bad device */
       if ((array->members[p].device) &&
           (! grub_disk_read (array->members[p].device,
-			     array->members[i].start_sector + sector,
+			     array->members[p].start_sector + sector,
 			     0, size, buf)))
         {
           grub_raid_block_xor (buf, pbuf, size);
@@ -169,7 +169,7 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p,
 
       grub_errno = GRUB_ERR_NONE;
       if (grub_disk_read (array->members[q].device,
-			  array->members[i].start_sector + sector, 0, size, buf))
+			  array->members[q].start_sector + sector, 0, size, buf))
         goto quit;
 
       grub_raid_block_xor (buf, qbuf, size);
@@ -188,14 +188,14 @@ grub_raid6_recover (struct grub_raid_array *array, int disknr, int p,
         }
 
       if (grub_disk_read (array->members[p].device,
-			  array->members[i].start_sector + sector,
+			  array->members[p].start_sector + sector,
 			  0, size, buf))
         goto quit;
 
       grub_raid_block_xor (pbuf, buf, size);
 
       if (grub_disk_read (array->members[q].device,
-			  array->members[i].start_sector + sector,
+			  array->members[q].start_sector + sector,
 			  0, size, buf))
         goto quit;