diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index 012512d8c8a..ff12c661d94 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/sys/boot/i386/libi386/amd64_tramp.S
@@ -108,6 +108,6 @@ longmode:
 	/* We're still running V=P, jump to entry point */
 	movl	%esi, %eax
 	salq	$32, %rax
-	movl	%edi, %eax
+	orq	%rdi, %rax
 	pushq	%rax
 	ret