diff --git a/config-armv7-generic b/config-armv7-generic
index 115bb56bb..8d9ea77b9 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -72,7 +72,7 @@ CONFIG_ARM_ERRATA_775420=y
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_PL310_ERRATA_769419=y
 # Cortex-A15
-CONFIG_ARM_ERRATA_798181=y
+# CONFIG_ARM_ERRATA_798181 is not set
 
 # generic that deviates from or should be merged into config-generic
 CONFIG_SMP=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 85bfdd4d7..f17b8616a 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -12,6 +12,9 @@ CONFIG_VIRTIO_CONSOLE=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
 
+# Cortex-A15
+CONFIG_ARM_ERRATA_798181=y
+
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
diff --git a/kernel.spec b/kernel.spec
index bc696a5a2..cecad6775 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2300,6 +2300,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jun 28 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Only enable ARM A15 errata on the LPAE kernel as it breaks A8
+
 * Thu Jun 27 2013 Josh Boyer <jwboyer@redhat.com>
 - Fix stack memory usage for DMA in ath3k (rhbz 977558)