diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index fddf0a167dd98570233416ad8f419c23181f7aff..a76ec156394fd8cf86b5b87584199c5073f2877b 100644
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -187,7 +187,7 @@ C .Laes_got_t:
 	pushl	%edi
 
 	C second column
-	AES_LAST_ROUND(d,a,b,c)
+	AES_LAST_ROUND(b,c,d,a)
 	pushl	%edi
 
 	C third column
@@ -195,13 +195,12 @@ C .Laes_got_t:
 	pushl	%edi
 
 	C fourth column
-	AES_LAST_ROUND(b,c,d,a)
+	AES_LAST_ROUND(d,a,b,c)
 	movl	%edi,%edx
 	
 	popl	%ecx
 	popl	%ebx
 	popl	%eax
-	xchgl	%ebx,%edx
 
 	C // S-box substitution
 	mov	$4,%edi