diff --git a/x86/camellia-crypt-internal.asm b/x86/camellia-crypt-internal.asm
index 46a4e3d9064a70dfe8e2d279ba132e88285947d9..fa16f76352c1a73f3fc34f511519c23d31021b5d 100644
--- a/x86/camellia-crypt-internal.asm
+++ b/x86/camellia-crypt-internal.asm
@@ -173,9 +173,9 @@ PROLOGUE(_nettle_camellia_crypt)
 	subl	$8, TMP
 	movl	TMP, FRAME_CNT
 	C 	Whitening using first subkey 
-	xorl	4(KEY), L0
-	xorl	8(KEY), H0
-	addl	$12, KEY
+	addl	$ALIGNOF_UINT64_T + 8, KEY
+	xorl	-8(KEY), L0
+	xorl	-4(KEY), H0
 
 	movl	FRAME_TABLE, T