diff --git a/debian/changelog b/debian/changelog
index b21c9ea73..16452324d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.39~rc7-1~experimental.2) experimental; urgency=low
+
+  * [x86] Enable CRYPTO_AES_NI_INTEL for all flavours. (closes: #623631)
+
+ -- maximilian attems <maks@debian.org>  Tue, 10 May 2011 23:24:26 +0200
+
 linux-2.6 (2.6.39~rc7-1~experimental.1) experimental; urgency=low
 
   * [x86] Enable modular ASUS_WMI and ASUS_NB_WMI. (closes: #626141)
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 79a7c6ffd..2a8dc24b9 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -113,6 +113,7 @@ CONFIG_XEN=y
 ##
 ## file: crypto/Kconfig
 ##
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 969623b17..8b557abca 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -35,7 +35,6 @@ CONFIG_X86_POWERNOW_K8=m
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m