diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config
index 90fb4113c..4b8bf0ced 100644
--- a/debian/arch/powerpc/config
+++ b/debian/arch/powerpc/config
@@ -1019,6 +1019,7 @@ CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HIDINPUT_POWERBOOK=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
index bae5ca713..927183f49 100644
--- a/debian/arch/powerpc/config.powerpc64
+++ b/debian/arch/powerpc/config.powerpc64
@@ -66,8 +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_THERM_PM72=m
 CONFIG_U3_DART=y
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -99,11 +98,11 @@ CONFIG_I2C_PMAC_SMU=y
 # CONFIG_PPC_83xx is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
-CONFIG_WINDFARM=y
-CONFIG_WINDFARM_PM91=y
-CONFIG_WINDFARM_PM112=y
+CONFIG_WINDFARM=m
+CONFIG_WINDFARM_PM91=m
+CONFIG_WINDFARM_PM112=m
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_WINDFARM_PM81=y
+CONFIG_WINDFARM_PM81=m
 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 fa95dfe10..f0c564c6a 100644
--- a/debian/arch/powerpc/vserver/config.powerpc64
+++ b/debian/arch/powerpc/vserver/config.powerpc64
@@ -66,8 +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_THERM_PM72=m
 CONFIG_U3_DART=y
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -99,11 +98,11 @@ CONFIG_I2C_PMAC_SMU=y
 # CONFIG_PPC_83xx is not set
 CONFIG_POWER3=y
 CONFIG_POWER4=y
-CONFIG_WINDFARM=y
-CONFIG_WINDFARM_PM91=y
-CONFIG_WINDFARM_PM112=y
+CONFIG_WINDFARM=m
+CONFIG_WINDFARM_PM91=m
+CONFIG_WINDFARM_PM112=m
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_WINDFARM_PM81=y
+CONFIG_WINDFARM_PM81=m
 CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_MAC_FLOPPY is not set
 # CONFIG_IBMEBUS is not set