diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
index 49ffd674e..bae5ca713 100644
--- a/debian/arch/powerpc/config.powerpc64
+++ b/debian/arch/powerpc/config.powerpc64
@@ -66,6 +66,7 @@ CONFIG_SCSI_IBMVSCSI=m
 CONFIG_SMP=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_I2C_POWERMAC=y
 CONFIG_THERM_PM72=y
 CONFIG_U3_DART=y
 CONFIG_WATCHDOG_RTAS=m
@@ -98,10 +99,11 @@ CONFIG_I2C_PMAC_SMU=y
 # CONFIG_PPC_83xx is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
-CONFIG_WINDFARM_PM91=m
-CONFIG_WINDFARM_PM112=m
+CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM91=y
+CONFIG_WINDFARM_PM112=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_WINDFARM_PM81=m
+CONFIG_WINDFARM_PM81=y
 CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_MAC_FLOPPY is not set
 # CONFIG_IBMEBUS is not set
diff --git a/debian/arch/powerpc/vserver/config.powerpc64 b/debian/arch/powerpc/vserver/config.powerpc64
index 010743927..fa95dfe10 100644
--- a/debian/arch/powerpc/vserver/config.powerpc64
+++ b/debian/arch/powerpc/vserver/config.powerpc64
@@ -66,6 +66,7 @@ CONFIG_SCSI_IBMVSCSI=m
 CONFIG_SMP=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_I2C_POWERMAC=y
 CONFIG_THERM_PM72=y
 CONFIG_U3_DART=y
 CONFIG_WATCHDOG_RTAS=m
@@ -98,10 +99,11 @@ CONFIG_I2C_PMAC_SMU=y
 # CONFIG_PPC_83xx is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
-CONFIG_WINDFARM_PM91=m
-CONFIG_WINDFARM_PM112=m
+CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM91=y
+CONFIG_WINDFARM_PM112=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_WINDFARM_PM81=m
+CONFIG_WINDFARM_PM81=y
 CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_MAC_FLOPPY is not set
 # CONFIG_IBMEBUS is not set
diff --git a/debian/changelog b/debian/changelog
index 1588ef64c..fb52dad2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux-2.6 (2.6.17-2) UNRELEASED; urgency=low
 
   [ Sven Luther ]
   * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour.
+  * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control.
 
  -- Jurij Smakov <jurij@debian.org>  Sat, 24 Jun 2006 10:54:59 -0700