diff --git a/config-arm-generic b/config-arm-generic
index e0507a0..625c611 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -63,6 +63,9 @@ CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
diff --git a/kernel.spec b/kernel.spec
index e584991..5a8f330 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2426,6 +2426,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Nov 20 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Change the minimum mmap address back to 32768 on ARM systems (thanks to Jon Masters)
+
 * Mon Nov 19 2012 Josh Boyer <jwboyer@redhat.com>
 - Apply patches from Jeff Moyer to fix direct-io oops (rhbz 812129)