diff --git a/architecture/powerpc/kernel.conf.m4 b/architecture/powerpc/kernel.conf.m4
index 6e432c5bd..71e9c4772 100644
--- a/architecture/powerpc/kernel.conf.m4
+++ b/architecture/powerpc/kernel.conf.m4
@@ -31,7 +31,7 @@ include(`kernel-net.conf')
 include(`kernel-fs.conf')
 
 dnl macs need a special RTC ... (this need to be fixed in the kernel so we
-dnl can have generic support for the rs6k and mac support at the same time
+dnl can have generic support for the rs6k and mac support at the same time)
 dnl
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
@@ -54,6 +54,12 @@ dnl
 CONFIG_PMAC_PBOOK=y
 CONFIG_PMAC_BACKLIGHT=y
 CONFIG_PMAC_APM_EMU=y
+dnl the thermal control stuff needed for newer desktop macs and iBook G4
+dnl
+CONFIG_I2C=y
+CONFIG_I2C_KEYWEST=y
+CONFIG_THERM_WINDTUNNEL=y
+CONFIG_THERM_ADT746X=y
 
 # for 2.6 kernels
 dnl
diff --git a/architecture/powerpc/kernel26-disable.lst b/architecture/powerpc/kernel26-disable.lst
index 126f82e08..68c46471b 100644
--- a/architecture/powerpc/kernel26-disable.lst
+++ b/architecture/powerpc/kernel26-disable.lst
@@ -8,3 +8,4 @@ CONFIG_VLSI_FIR		2003-12-22	2.6.0
 CONFIG_SCSI_AHA1542	2003-12-22	2.6.0
 CONFIG_MAC_SERIAL	2004-03-20	2.6.3	# suspend unfunctional
 CONFIG_SERIAL_PMACZILOG	2004-03-20	2.6.3	# suspend unfunctional
+CONFIG_PREEMPT		2004-06-06	2.6.7