diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 9e0f23d71..3fae1e4e1 100644
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -341,6 +341,6 @@ gate_a20_check_state:
 #include "lzma_decode.S"
 #endif
 
-	.p2align 2
+	.p2align 4
 
 LOCAL(decompressor_end):
diff --git a/grub-core/kern/i386/realmode.S b/grub-core/kern/i386/realmode.S
index 2e16847c8..36d41e7de 100644
--- a/grub-core/kern/i386/realmode.S
+++ b/grub-core/kern/i386/realmode.S
@@ -46,7 +46,7 @@
  *  This is the area for all of the special variables.
  */
 
-	.p2align	2	/* force 4-byte alignment */
+	.p2align	5	/* force 4-byte alignment */
 
 protstack:
 	.long	GRUB_MEMORY_MACHINE_PROT_STACK
@@ -79,7 +79,7 @@ protstack:
  *  description.
  */
 
-	.p2align	2	/* force 4-byte alignment */
+	.p2align	5	/* force 4-byte alignment */
 gdt:
 	.word	0, 0
 	.byte	0, 0, 0, 0
@@ -113,6 +113,7 @@ gdt:
 	.byte	0, 0x92, 0, 0
 
 
+	.p2align 5
 /* this is the GDT descriptor */
 gdtdesc:
 	.word	0x27			/* limit */