diff --git a/ChangeLog b/ChangeLog
index 6a50c114f..ecf8ba19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/raid6_recover.c (grub_raid_block_mulx): Use grub_size_t
+	for size.
+
 2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/lvm.c: Use grub_size_t for sizes and grub_ssize_t
diff --git a/grub-core/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c
index 61a8ba666..f9ec632fb 100644
--- a/grub-core/disk/raid6_recover.c
+++ b/grub-core/disk/raid6_recover.c
@@ -34,9 +34,9 @@ static unsigned powx_inv[256];
 static const grub_uint8_t poly = 0x1d;
 
 static void
-grub_raid_block_mulx (unsigned mul, char *buf, int size)
+grub_raid_block_mulx (unsigned mul, char *buf, grub_size_t size)
 {
-  int i;
+  grub_size_t i;
   grub_uint8_t *p;
 
   p = (grub_uint8_t *) buf;