diff --git a/target/desktop/kernel.conf b/target/desktop/kernel.conf
index 6b61321a0..532b6c47c 100644
--- a/target/desktop/kernel.conf
+++ b/target/desktop/kernel.conf
@@ -55,9 +55,6 @@ CONFIG_ACPI_THERMAL=y
 
 CONFIG_APM=y
 
-# a nice desktop feature in 2.6 kernels
-CONFIG_PREEMPT=y
-
 # some embedded or server stuff
 CONFIG_MTD=n
 CONFIG_PHONE=n
diff --git a/target/desktop/kernel.conf.sh b/target/desktop/kernel.conf.sh
index 09e059035..bbb48d319 100644
--- a/target/desktop/kernel.conf.sh
+++ b/target/desktop/kernel.conf.sh
@@ -2,6 +2,13 @@
 
 echo "desktop target -> disabling oss sound modules ..."
 
-sed -e"s/CONFIG_SOUND_OSS=./# CONFIG_SOUND_OSS is not set/" \
--e"s/CONFIG_SOUND_PRIME=./# CONFIG_SOUND_PRIME is not set/" $1 > .config.desktop 
-mv .config.desktop $1
+sed -i -e "s/CONFIG_SOUND_OSS=./# CONFIG_SOUND_OSS is not set/" \
+       -e"s/CONFIG_SOUND_PRIME=./# CONFIG_SOUND_PRIME is not set/" $1
+
+# preemtion is not stable on PowerPC - so only enable it for x86 for now
+if [ $arch = x86 ] ; then
+	sed -i "s/# CONFIG_PREEMPT is not set/CONFIG_PREEMPT=y/" $1
+else
+	sed -i "s/CONFIG_PREEMPT=y/# CONFIG_PREEMPT is not set/" $1
+fi
+