diff --git a/boot/startup32.S b/boot/startup32.S
index 342af79..4908833 100644
--- a/boot/startup32.S
+++ b/boot/startup32.S
@@ -73,7 +73,7 @@ startup:
 	# Use a temporary stack until we pick the correct one. We can
 	# safely use the high address, even if we are loaded low.
 
-	movl	$(HIGH_LOAD_ADDR + startup_stack_top - startup), %esp
+	movl	$(HIGH_LOAD_ADDR + startup_stack_top - startup32), %esp
 
 	# Load the GOT pointer.
 
diff --git a/boot/startup64.S b/boot/startup64.S
index 2a2efa7..c463bdf 100644
--- a/boot/startup64.S
+++ b/boot/startup64.S
@@ -35,7 +35,7 @@ startup32:
 	# Use a temporary stack until we pick the correct one. We can
 	# safely use the high address, even if we are loaded low.
 
-	movl	$(HIGH_LOAD_ADDR + startup_stack_top - startup), %esp
+	movl	$(HIGH_LOAD_ADDR + startup_stack_top - startup32), %esp
 
 	# Get the load address.