diff --git a/debian/changelog b/debian/changelog
index f640e9087..a5b638e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -187,6 +187,9 @@ linux (3.16.7-ckt9-1) UNRELEASED; urgency=medium
   * [x86] microcode/intel: Guard against stack overflow in the loader
     (CVE-2015-2666)
   * ipv6: Don't reduce hop limit for an interface (CVE-2015-2922)
+  * [powerpc/powerpc64,ppc64] Disable THERM_PM72 and enable its replacements
+    WINDFARM_PM72 and WINDFARM_RM31 as modules. Update the udeb config
+    accordingly. Thanks to Milan Kupcevic. (Closes: #781934)
 
  -- Ian Campbell <ijc@debian.org>  Wed, 18 Mar 2015 21:07:15 +0000
 
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 4cfa08ed2..f23ad8fd2 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -65,7 +65,9 @@ CONFIG_I2C_PASEMI=m
 ##
 ## file: drivers/macintosh/Kconfig
 ##
-CONFIG_THERM_PM72=m
+# CONFIG_THERM_PM72 is not set
+CONFIG_WINDFARM_RM31=m
+CONFIG_WINDFARM_PM72=m
 CONFIG_WINDFARM_PM81=m
 CONFIG_WINDFARM_PM91=m
 CONFIG_WINDFARM_PM112=m
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules
index f069ca199..a3fc55cca 100644
--- a/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules
+++ b/debian/installer/powerpc/modules/powerpc-powerpc64/fancontrol-modules
@@ -1,5 +1,4 @@
 i2c-powermac ?
-therm_pm72 ?
 windfarm_core ?
 windfarm_cpufreq_clamp ?
 windfarm_lm75_sensor ?
@@ -9,6 +8,12 @@ windfarm_pm121 ?
 windfarm_pm112 ?
 windfarm_pm81 ?
 windfarm_pm91 ?
+windfarm_pm72 ?
+windfarm_rm31 ?
 windfarm_smu_controls ?
 windfarm_smu_sat ?
 windfarm_smu_sensors ?
+windfarm_ad7417_sensor ?
+windfarm_fcu_controls ?
+windfarm_lm87_sensor ?
+windfarm_pid ?