diff --git a/config-armv7 b/config-armv7
index 31439c029..07b8f7acf 100644
--- a/config-armv7
+++ b/config-armv7
@@ -146,8 +146,7 @@ CONFIG_PWM_OMAP_DMTIMER=m
 # CONFIG_PWM_STMPE is not set
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-# Disable for the moment, terribly broken upstream
-# CONFIG_CRYPTO_DEV_OMAP_AES is not set
+CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
diff --git a/kernel.spec b/kernel.spec
index 9de281337..b54e34f7d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2144,6 +2144,7 @@ fi
 %changelog
 * Sat Oct 15 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Minor ARM config cleanups
+- Re-enable omap-aes as should now be fixed
 
 * Fri Oct 14 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git9.1
 - Linux v4.8-14604-g29fbff8