diff --git a/config-armv7 b/config-armv7
index 700940074..4c69f2848 100644
--- a/config-armv7
+++ b/config-armv7
@@ -146,7 +146,8 @@ CONFIG_PWM_OMAP_DMTIMER=m
 # CONFIG_PWM_STMPE is not set
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-CONFIG_CRYPTO_DEV_OMAP_AES=m
+# Disable for the moment, terribly broken upstream
+# CONFIG_CRYPTO_DEV_OMAP_AES is not set
 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 7ff697688..179e3d135 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2154,6 +2154,7 @@ fi
 * Sun Sep  4 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Use IIO BMP280 driver instead of old misc driver, wider HW support
 - Minor sensor driver changes
+- Disable omap_aes currently broken
 
 * Fri Sep 02 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git4.1
 - Linux v4.8-rc4-199-gcc4163d