Index: PKGBUILD
===================================================================
--- PKGBUILD	(revision 104364)
+++ PKGBUILD	(working copy)
@@ -10,7 +10,7 @@
 pkgname=xbmc
 pkgver=12.3
 _codename=Frodo
-pkgrel=6
+pkgrel=7
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -27,16 +27,11 @@
 	    'lirc: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them'
-	    'xorg-xinit: autostart xbmc')
+	    'unrar: access compressed files without unpacking them')
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service"
-	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
-         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
-         'd4cbb6609c8e7b713c714241f529000e'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
 prepare() {
@@ -115,9 +110,5 @@
   for licensef in LICENSE.GPL copying.txt; do
     mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
   done
-
-  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
-  chmod 0700 $pkgdir/etc/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
Index: polkit.rules
===================================================================
--- polkit.rules	(revision 104364)
+++ polkit.rules	(working copy)
@@ -1,11 +0,0 @@
-polkit.addRule(function(action, subject) {
-  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
-    return polkit.Result.YES;
-  }
-});
-
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
-    return polkit.Result.YES;
-  }
-});
Index: xbmc.install
===================================================================
--- xbmc.install	(revision 104364)
+++ xbmc.install	(working copy)
@@ -1,17 +1,19 @@
 post_install() {
   [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
-  chown -R 102:0 etc/polkit-1
 }
 
 post_upgrade() {
   post_install $1
+
+  if [ "$(vercmp 12.3-7 "$2")" -eq 1 ]; then
+    printf '==> This package no logner ships a systemd unit file. You may want to remove\n'
+    printf '    xbmc user and group if you do not want to use this functionality in the\n'
+    printf '    future. See https://wiki.archlinux.org/index.php/Xbmc#Autostarting_at_boot\n'
+    printf '    for more details.\n'
+  fi
 }
 
 post_remove() {
   post_install $1
-  echo "You may want to remove xbmc user and group"
 }
Index: xbmc.service
===================================================================
--- xbmc.service	(revision 104364)
+++ xbmc.service	(working copy)
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target