diff --git a/ChangeLog b/ChangeLog
index 2f56c51a7..d1485af22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-06  Robert Millan  <rmh@aybabtu.com>
+
+	Ensure GRUB_KERNEL_MACHINE_DATA_END is always consistent with the
+	rest of GRUB, and breakage doesn't happen if its value were modified.
+
+	* include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
+	Redefine as an offset from `GRUB_KERNEL_MACHINE_DATA_END' instead of
+	a constant (same value).
+	* kern/i386/pc/startup.S: Replace hardcoded `0x50' with
+	`GRUB_KERNEL_MACHINE_DATA_END' (same value).
+
 2008-06-06  Robert Millan  <rmh@aybabtu.com>
 
 	* util/biosdisk.c (open_device): Do not modify sector offset when
diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index 43a8d5b6e..13e887354 100644
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -44,7 +44,7 @@
 #define GRUB_KERNEL_MACHINE_DATA_END		0x50
 
 /* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_MACHINE_RAW_SIZE		0x4A0
+#define GRUB_KERNEL_MACHINE_RAW_SIZE		(GRUB_KERNEL_MACHINE_DATA_END + 0x450)
 
 #ifndef ASM_FILE
 
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index ebb98fe60..954297891 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -105,7 +105,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + 0x50
+	. = EXT_C(start) + GRUB_KERNEL_MACHINE_DATA_END
 
 /*
  * Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).