diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 45409c13f6ef..dca07ae933d7 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -105,7 +105,7 @@ libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
 					   $(mcore-y)/ \
-					   arch/i386/crypto/
+					   arch/x86/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # must be linked after kernel/
diff --git a/arch/i386/crypto/Makefile b/arch/x86/crypto/Makefile
similarity index 64%
rename from arch/i386/crypto/Makefile
rename to arch/x86/crypto/Makefile
index fbd34ac2cda2..b1bcf7c63028 100644
--- a/arch/i386/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/crypto/Makefile_32
+include ${srctree}/arch/x86/crypto/Makefile_32
 else
 include ${srctree}/arch/x86_64/crypto/Makefile_64
 endif
diff --git a/arch/i386/crypto/Makefile_32 b/arch/x86/crypto/Makefile_32
similarity index 90%
rename from arch/i386/crypto/Makefile_32
rename to arch/x86/crypto/Makefile_32
index 7154b14cd950..2d873a2388ed 100644
--- a/arch/i386/crypto/Makefile_32
+++ b/arch/x86/crypto/Makefile_32
@@ -1,5 +1,5 @@
 # 
-# i386/crypto/Makefile 
+# x86/crypto/Makefile 
 # 
 # Arch-specific CryptoAPI modules.
 # 
diff --git a/arch/i386/crypto/aes-i586-asm_32.S b/arch/x86/crypto/aes-i586-asm_32.S
similarity index 100%
rename from arch/i386/crypto/aes-i586-asm_32.S
rename to arch/x86/crypto/aes-i586-asm_32.S
diff --git a/arch/i386/crypto/aes_32.c b/arch/x86/crypto/aes_32.c
similarity index 100%
rename from arch/i386/crypto/aes_32.c
rename to arch/x86/crypto/aes_32.c
diff --git a/arch/i386/crypto/twofish-i586-asm_32.S b/arch/x86/crypto/twofish-i586-asm_32.S
similarity index 100%
rename from arch/i386/crypto/twofish-i586-asm_32.S
rename to arch/x86/crypto/twofish-i586-asm_32.S
diff --git a/arch/i386/crypto/twofish_32.c b/arch/x86/crypto/twofish_32.c
similarity index 100%
rename from arch/i386/crypto/twofish_32.c
rename to arch/x86/crypto/twofish_32.c
diff --git a/arch/x86_64/crypto/Makefile b/arch/x86_64/crypto/Makefile
index fbd34ac2cda2..b1bcf7c63028 100644
--- a/arch/x86_64/crypto/Makefile
+++ b/arch/x86_64/crypto/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/crypto/Makefile_32
+include ${srctree}/arch/x86/crypto/Makefile_32
 else
 include ${srctree}/arch/x86_64/crypto/Makefile_64
 endif