diff --git a/ChangeLog b/ChangeLog
index e622b6da5..907a489de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/sparc64/ieee1275/crt0.S: Align stack.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't export grub_gate_a20.
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index f178f5d3c..cebdca2b6 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -61,9 +61,11 @@ codestart:
 	/* Save ieee1275 stack for future use by booter.  */
 	mov     %o6, %o1
 	/* Our future stack.  */
-	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
-	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
+	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
 	add     %o3, %o5, %o6
+	and     %o6, ~0xff, %o6
+	sub     %o6, 2047, %o6
 	
 	sub	%o2, 4, %o2
 	sub	%o3, 4, %o3