diff --git a/ChangeLog b/ChangeLog
index 687db986b..ab0ebc1f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/i386/pc/startup.S (multiboot_header): Force 4-byte alignment
+	as required by Multiboot spec (it was already 4-byte aligned, but
+	only by chance).
+
 2008-08-29  Pavel Roskin  <proski@gnu.org>
 
 	* kern/powerpc/ieee1275/crt0.S: Rename to ...
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 197c447e3..18f61d801 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -110,6 +110,7 @@ VARIABLE(grub_prefix)
  * This uses the a.out kludge to load raw binary to the area starting at 1MB,
  * and relocates itself after loaded.
  */
+	.p2align	2	/* force 4-byte alignment */
 multiboot_header:
 	/* magic */
 	.long	0x1BADB002