diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index c688f0a..c2196cb 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libvirt
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -62,12 +62,14 @@ validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F')
 source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz" #{,.asc}
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d)
+	libvirt.tmpfiles.d
+	libvirt.sysusers.d)
 #	"ae102b5d7bccd29bc6015a3e0acefeaa90d097ac.patch::https://libvirt.org/git/?p=libvirt.git;a=patch;h=ae102b5d7bccd29bc6015a3e0acefeaa90d097ac")
 sha256sums=('2963bae30d41411a2a8184de6a69cc3bd4dba14d2824b67906263dc35b27b516'
             '9d0597bbf2bd7892420cebaf0563236fe1483b83ae95ee6263c1ce7f44a44134'
             '0896c30100e9e40aee1eb4a2cf0cac2c0bdd5fd7b077b9d2680d90e77435ea66'
-            '5c26353833944db8dc97aa63843734519d6521bd8d88497d94d910ee9d3169d8')
+            'a82c86ecb80d30b6fca543b92e09319c4cbcbdf35c368dad2be7e16e2eade8a5'
+            '6dc7907d6d4d883ac5ea15c195af673c97cff13f4c0493d23196e94bc87f04db')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -82,8 +84,7 @@ prepare() {
     tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
     src/locking/virtlockd.service.in
   sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in
-  # 78 is kvm group: https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database
-  sed -i 's|#group =.*|group="78"|' src/qemu/qemu.conf
+  sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
   sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
     src/qemu/qemu{.conf,_conf.c} \
     src/qemu/test_libvirtd_qemu.aug.in
@@ -117,9 +118,7 @@ package() {
   install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
   install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests
   install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
-
-  chown -R 0:78 "$pkgdir"/var/lib/libvirt/qemu
-  chmod 0770 "$pkgdir"/var/lib/libvirt/qemu
+  install -D -m644 "$srcdir"/libvirt.sysusers.d "$pkgdir"/usr/lib/sysusers.d/libvirt.conf
 
   chown 0:102 "$pkgdir"/usr/share/polkit-1/rules.d
   chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d
diff --git a/trunk/libvirt.install b/trunk/libvirt.install
index 398c1b3..365f7f4 100644
--- a/trunk/libvirt.install
+++ b/trunk/libvirt.install
@@ -1,5 +1,4 @@
 post_install() {
-  groupadd -r -f libvirt
   echo ">>> libvirt runs qemu from nobody:kvm by default"
   echo ">>> change the USER if desired in /etc/libvirt/qemu.conf"
   echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info"
diff --git a/trunk/libvirt.sysusers.d b/trunk/libvirt.sysusers.d
new file mode 100644
index 0000000..f2544db
--- /dev/null
+++ b/trunk/libvirt.sysusers.d
@@ -0,0 +1 @@
+g libvirt - -
diff --git a/trunk/libvirt.tmpfiles.d b/trunk/libvirt.tmpfiles.d
index 2804c43..0eaed7b 100644
--- a/trunk/libvirt.tmpfiles.d
+++ b/trunk/libvirt.tmpfiles.d
@@ -2,3 +2,4 @@ d /run/libvirt/qemu 0755 root root -
 d /run/libvirt/lxc 0755 root root -
 d /run/libvirt/uml 0755 root root -
 d /run/libvirt/network 0755 root root -
+z /var/lib/libvirt/qemu 0770 root kvm -