diff --git a/ChangeLog b/ChangeLog
index 10db262af..b60a71d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/disk/efi/efidisk.c: Really limit transfer chunk size.
+
 2013-04-16  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* autogen.sh: Use "-f" in addition for "-h" when checking file presence.
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 5a6fc630a..0e08d3bec 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -549,7 +549,7 @@ grub_efidisk_readwrite (struct grub_disk *disk, grub_disk_addr_t sector,
       status = efi_call_5 ((wr ? bio->write_blocks : bio->read_blocks), bio,
 			   bio->media->media_id,
 			   (grub_efi_uint64_t) sector,
-			   (grub_efi_uintn_t) size << disk->log_sector_size,
+			   (grub_efi_uintn_t) len << disk->log_sector_size,
 			   buf);
       size -= len;
       buf += len << disk->log_sector_size;