diff --git a/ChangeLog b/ChangeLog
index feea17861..5edbf6728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low
+	tables for low memory calculations.
+
 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi): Limit
diff --git a/grub-core/mmap/i386/uppermem.c b/grub-core/mmap/i386/uppermem.c
index bd8b429c4..a6be9896d 100644
--- a/grub-core/mmap/i386/uppermem.c
+++ b/grub-core/mmap/i386/uppermem.c
@@ -31,8 +31,12 @@ lower_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
 
   if (type != GRUB_MEMORY_AVAILABLE)
     return 0;
+#ifdef GRUB_MACHINE_COREBOOT
+  if (addr <= 0x1000)
+#else
   if (addr == 0)
-    *lower = size;
+#endif
+    *lower = size + addr;
   return 0;
 }