diff --git a/alarm/xbmc-rbp-git/PKGBUILD b/alarm/xbmc-rbp-git/PKGBUILD
index 2a5f0f0cf..5b2342a4f 100644
--- a/alarm/xbmc-rbp-git/PKGBUILD
+++ b/alarm/xbmc-rbp-git/PKGBUILD
@@ -22,8 +22,10 @@ optdepends=(
 provides=("xbmc")
 conflicts=("xbmc")
 install="xbmc.install"
-source=('xbmc.service')
-md5sums=('36780e43d432c488259d9a899b1bcb28')
+source=('xbmc.service'
+        'polkit.rules')
+md5sums=('4fe0ed48de968fe3778fa8765d1647f3'
+         'db407faa4beb83b6368fc65ba9bc9507')
 
 _gitname="xbmc"
 _gitroot="git://github.com/xbmc"
@@ -114,5 +116,5 @@ package() {
 
   # systemd stuff
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-
+  install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
 }
diff --git a/alarm/xbmc-rbp-git/xbmc.service b/alarm/xbmc-rbp-git/xbmc.service
index c7e929c13..91396015f 100644
--- a/alarm/xbmc-rbp-git/xbmc.service
+++ b/alarm/xbmc-rbp-git/xbmc.service
@@ -6,8 +6,8 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xbmc-standalone
-Restart = on-failure
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+Restart = on-abort
 
 [Install]
 WantedBy = multi-user.target