diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 65c19f4666..c57d1064cd 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -65,7 +65,7 @@ $SCRIPTS/install samba
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/bin
-  cp -PR $PKG_DIR/scripts/xbmc $INSTALL/usr/bin
+  cp -PR $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/share/xbmc
   cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
diff --git a/packages/mediacenter/xbmc/scripts/xbmc b/packages/mediacenter/xbmc/scripts/xbmc
deleted file mode 100755
index e7f74aa442..0000000000
--- a/packages/mediacenter/xbmc/scripts/xbmc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /etc/sysconfig
-
-export DISPLAY=":0.0"
-
-/usr/share/xbmc/xbmc.bin \
-  --standalone \
-  -fs \
-  --lircdev $LIRC_OUTPUT \
-  $@
-
-RET=$?
-echo "Exited with code $RET"
-
-[ "$RET" == 0 ] && initctl emit shutdown REBOOT=no
-[ "$RET" == 64 ] && initctl emit shutdown REBOOT=no
-[ "$RET" == 66 ] && initctl emit shutdown REBOOT=yes
diff --git a/packages/mediacenter/xbmc/scripts/xbmc-session b/packages/mediacenter/xbmc/scripts/xbmc-session
new file mode 100755
index 0000000000..40e0603dbf
--- /dev/null
+++ b/packages/mediacenter/xbmc/scripts/xbmc-session
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. /etc/sysconfig
+
+XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT"
+
+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
+
+while true; do
+
+  [ $START_WM="yes" ] && $WINDOWMANAGER &
+
+  $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
+  RET=$?
+  echo "Exited with code $RET"
+
+  [ "$RET" == 0 ] && break
+  [ "$RET" == 64 ] && sync && poweroff
+  [ "$RET" == 66 ] && sync && reboot
+
+done