diff --git a/debian/changelog b/debian/changelog
index 5f69a142f..f28048897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ linux-2.6 (2.6.37-1) UNRELEASED; urgency=low
   * acer-wmi, aic94xx, asus_acpi, iscsi, janz-ican3, rtc-ds1511, tc1100-wmi:
     Restrict write permissions on files in procfs/sysfs
   * nbd: Remove module-level ioctl mutex mistakenly introduced in 2.6.37
+  * [x86] crypto: Re-enable AES_NI_INTEL as module (Closes: #597658)
 
   [ Aurelien Jarno ]
   * [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 229af5d2c..f4ec93d31 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -36,7 +36,7 @@ CONFIG_X86_POWERNOW_K8=m
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m