diff --git a/config-armv7-generic b/config-armv7-generic
index 0ce8e86ae..27975c377 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -305,6 +305,7 @@ CONFIG_MPCORE_WATCHDOG=m
 
 # Thermal / powersaving
 CONFIG_THERMAL=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_ARM_PSCI=y
 
 # Mailbox
diff --git a/kernel.spec b/kernel.spec
index 816ecfb39..7fdb6689f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2273,6 +2273,7 @@ fi
 %changelog
 * Sun Jan 12 2014 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable generic cpufreq-cpu0 driver on ARM
+- Enable thermal userspace support for ARM
 
 * Fri Jan 10 2014 Justin M. Forbes <jforbes@fedoraproject.org - 3.12.7-300
 - Linux v3.12.7