diff --git a/ChangeLog b/ChangeLog
index 2bf4ef182..1fac7e8f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/x86_64/xen/startup.S: Align stack.
+
 2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Add support for converting PE+ to Elf64.
diff --git a/grub-core/kern/x86_64/xen/startup.S b/grub-core/kern/x86_64/xen/startup.S
index 7217ee57b..21a139f40 100644
--- a/grub-core/kern/x86_64/xen/startup.S
+++ b/grub-core/kern/x86_64/xen/startup.S
@@ -30,6 +30,7 @@ _start:
 	leaq	LOCAL(stack_end), %rsp
 	movq	%rsi, EXT_C(grub_xen_start_page_addr)(%rip)
 
+	andq	$~0xf, %rsp
 	call	EXT_C(grub_main)
 	/* Doesn't return.  */