diff --git a/config-x86-generic b/config-x86-generic
index 7d6b72ba5..79a63a880 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -200,7 +200,6 @@ CONFIG_X86_TRAMPOLINE=y
 #
 CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
-CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -557,7 +556,8 @@ CONFIG_X86_32_IRIS=m
 
 CONFIG_TRANSPARENT_HUGEPAGE=y
 
-CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_AES_586=y
 
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_PHYSMAP_OF=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 919bd226f..fe187a1bc 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -168,6 +168,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
+
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 
diff --git a/kernel.spec b/kernel.spec
index 7f6388d84..0fafbdc54 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1929,6 +1929,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jun 15 2011 Kyle McMartin <kmcmartin@redhat.com>
+- Build in aesni-intel on i686 for symmetry with 64-bit.
+
 * Tue Jun 14 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc3.git0.3
 - Fix libdm conflict (whose bright idea was it to give subpackages differing
   version numbers?)