diff --git a/ChangeLog b/ChangeLog
index f3596ba07..d57ca56e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/i386/linux.c (find_efi_mmap_size): Increase
+	additional size to 3 pages.
+	Reported by: Stuart Hayes.
+
 2012-06-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* NEWS: Add 2.00 entry.
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 69575592c..62087cfaa 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -139,7 +139,7 @@ find_efi_mmap_size (void)
 
   /* Increase the size a bit for safety, because GRUB allocates more on
      later, and EFI itself may allocate more.  */
-  mmap_size += (1 << 12);
+  mmap_size += (3 << 12);
 
   mmap_size = page_align (mmap_size);
   return mmap_size;