diff --git a/packages/mediacenter/xbmc/init.d/09_cache_xbmc b/packages/mediacenter/xbmc/init.d/09_cache_xbmc
deleted file mode 100755
index 38b6217b4c..0000000000
--- a/packages/mediacenter/xbmc/init.d/09_cache_xbmc
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# caching xbmc
-#
-# runlevels: openelec, textmode
-
-if [ "$XBMC_CACHING" = "yes" ]; then
-
-  progress "caching XBMC"
-
-  cache_xbmc
-
-fi
\ No newline at end of file
diff --git a/packages/mediacenter/xbmc/init.d/60_xbmc b/packages/mediacenter/xbmc/init.d/60_xbmc
new file mode 100644
index 0000000000..21abe13f02
--- /dev/null
+++ b/packages/mediacenter/xbmc/init.d/60_xbmc
@@ -0,0 +1,24 @@
+# starting XBMC
+#
+# runlevels: openelec
+
+. /etc/profile
+
+progress "starting XBMC"
+
+  XBMC_ARGS="--standalone -fs --lircdev /dev/lircd"
+
+  [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
+
+  while true; do
+
+    DISPLAY=:0.0 xbmc $XBMC_ARGS > /dev/null 2>&1
+    RET=$?
+    echo "Exited with code $RET"
+
+    [ "$RET" == 0 ] && sync && poweroff
+    [ "$RET" == 64 ] && sync && poweroff
+    [ "$RET" == 66 ] && sync && reboot
+
+    usleep 250000
+  done
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 5ecda158c7..c1b171057f 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -68,11 +68,11 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
 
 mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
+  cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/bin/xbmc
+#  cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
   cp -P $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
 
 mkdir -p $INSTALL/usr/share/xbmc
-  cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
   cp -P $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
 
 mkdir -p $INSTALL/usr/share/xbmc/language
diff --git a/packages/mediacenter/xbmc/scripts/xbmc-session b/packages/mediacenter/xbmc/scripts/xbmc-session
deleted file mode 100755
index 88005e00d1..0000000000
--- a/packages/mediacenter/xbmc/scripts/xbmc-session
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. /etc/profile
-
-XBMC_ARGS="--standalone -fs --lircdev /dev/lircd"
-
-if test "$XBMC_CACHING" = "yes" ; then
-  wait_for_xbmc_cache
-  XBMC_BIN="/var/cache/bin/xbmc.bin"
-else
-  XBMC_BIN="/usr/share/xbmc/xbmc.bin"
-fi
-
-[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
-
-while true; do
-
-  $IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
-  RET=$?
-  echo "Exited with code $RET"
-
-  [ "$RET" == 0 ] && sync && poweroff
-  [ "$RET" == 64 ] && sync && poweroff
-  [ "$RET" == 66 ] && sync && reboot
-
-done