diff --git a/packages/linux/init.d/02_cpupower b/packages/linux/init.d/02_cpupower
index cbda65d1ec..bb4b7375ae 100644
--- a/packages/linux/init.d/02_cpupower
+++ b/packages/linux/init.d/02_cpupower
@@ -24,5 +24,20 @@
 # runlevels: openelec, textmode
 
 progress "set cpu's to full power"
+  for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do
+    printf "performance" > $i
+  done
+
+progress "set onedemand threshold"
+  if [ -f /sys/devices/system/cpu/cpufreq/ondemand/up_threshold ]; then
+    echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
+  fi
+
+(
+  usleep 40000000
+  progress "set cpu's to 'ondemand'"
+  for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do
+    printf "ondemand" > $i
+  done
+)&
 
-  cpupower frequency-set -g performance > /dev/null 2>&1
diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index 51ba5d0844..e9365edc70 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -55,12 +55,6 @@ fi
 # wait for udevadm settle to finish
   wait_for_udevadm_settle
 
-# set cpu's to 'ondemand'
-  ( usleep 15000000
-    progress "set cpu's to 'ondemand'"
-    cpupower frequency-set -g ondemand > /dev/null 2>&1
-  )&
-
 # prevent restrating XBMC at reboot or shutdown
   LOCKDIR="/var/lock/"
   LOCKFILE="xbmc.disabled"