diff --git a/srcpkgs/libvirt/files/libvirt.tmpfiles.d b/srcpkgs/libvirt/files/libvirt.tmpfiles.d
index 0cec9327142..2804c43c837 100644
--- a/srcpkgs/libvirt/files/libvirt.tmpfiles.d
+++ b/srcpkgs/libvirt/files/libvirt.tmpfiles.d
@@ -1,4 +1,4 @@
-d /var/run/libvirt/qemu 0755 root root -
-d /var/run/libvirt/lxc 0755 root root -
-d /var/run/libvirt/uml 0755 root root -
-d /var/run/libvirt/network 0755 root root -
+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 -
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 8bc0b7bdbb9..fdac536daa7 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,10 +1,11 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=1.0.2
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--without-hal --with-storage-lvm --without-xen
- --disable-static --with-init-script=systemd
+ --disable-static --with-init-script=systemd --with-qemu-user=nobody
+ --with-qemu-group=nobody --without-netcf --with-interface --sbindir=/usr/sbin
  ac_cv_path_MOUNT=/bin/mount ac_cv_path_UMOUNT=/bin/umount
  ac_cv_path_MKFS=/sbin/mkfs ac_cv_path_SHOWMOUNT=/usr/sbin/showmount"
 short_desc="The virtualization API for controlling virtualization engines"
@@ -12,34 +13,35 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://libvirt.org"
 license="LGPL-2.1"
 distfiles="http://libvirt.org/sources/$pkgname-$version.tar.gz"
-checksum=9b8c2752f78658b65ef1c608b3775be0978d60855a9b5e2778f79c113201c179
+checksum=ce9e765697ecb595469489665043ce221d9b70babc16fec77ee938fe37676928
 
-makedepends="perl pkg-config readline-devel libcap-ng-devel libnl3-devel
+hostmakedepends="perl pkg-config"
+makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
  gnutls-devel>=3.1.5 libsasl-devel libcurl-devel libpcap-devel libxml2-devel
  libparted-devel device-mapper-devel dbus-devel libudev-devel>=183
  libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel
- python-devel libssh2-devel lvm2 parted"
+ python-devel libssh2-devel libnuma-devel libcap-ng-devel fuse-devel
+ lvm2 parted"
 
 post_install() {
-	# Remove static files.
-	rm -f ${DESTDIR}/usr/lib/libvirt/connection-driver/*.a
+	# Move everything to /usr.
 	vmkdir usr/lib
 	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
 	rm -rf ${DESTDIR}/etc/sysconfig
-	# Remove sysconfig specific stuff from systemd services.
-	sed -i -e "/EnvironmentFile.*/d;" ${DESTDIR}/usr/lib/systemd/system/*.service
-	sed -i -e "s| \$LIBVIRTD_ARGS||;s|@sbindir@|/usr/sbin|g" \
-		${DESTDIR}/usr/lib/systemd/system/*.service
-	
+	# Remove unused stuff.
+	rm -rf ${DESTDIR}/etc/logrotate.d
+	rm -rf ${DESTDIR}/var/log
+	# systemd stuff.
 	vinstall ${FILESDIR}/libvirt.tmpfiles.d 644 usr/lib/tmpfiles.d libvirt.conf
 }
 
 libvirt-devel_package() {
 	depends="libvirt>=$version"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 		vmove usr/share/doc/libvirt-${version}
 	}
@@ -47,7 +49,7 @@ libvirt-devel_package() {
 
 libvirt-python_package() {
 	depends="python"
-	short_desc="${short_desc} - python bindings"
+	short_desc+=" - python bindings"
 	pycompile_module="libvirt.py libvirt_qemu.py"
 	pkg_install() {
 		vmove "usr/lib/python*"
@@ -58,31 +60,11 @@ libvirt-python_package() {
 libvirt_package() {
 	depends="lvm2 parted"
 	conf_files="
-		/etc/libvirt/lxc.conf
-		/etc/libvirt/qemu-lockd.conf
 		/etc/libvirt/libvirt.conf
-		/etc/libvirt/qemu/networks/default.xml
-		/etc/libvirt/qemu/networks/autostart
-		/etc/libvirt/qemu/networks/autostart/default.xml
-		/etc/libvirt/nwfilter/qemu-announce-self.xml
-		/etc/libvirt/nwfilter/allow-ipv4.xml
-		/etc/libvirt/nwfilter/allow-incoming-ipv4.xml
-		/etc/libvirt/nwfilter/allow-dhcp.xml
-		/etc/libvirt/nwfilter/no-other-l2-traffic.xml
-		/etc/libvirt/nwfilter/no-mac-spoofing.xml
-		/etc/libvirt/nwfilter/no-other-rarp-traffic.xml
-		/etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
-		/etc/libvirt/nwfilter/allow-arp.xml
-		/etc/libvirt/nwfilter/allow-dhcp-server.xml
-		/etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
-		/etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
-		/etc/libvirt/nwfilter/no-mac-broadcast.xml
-		/etc/libvirt/nwfilter/no-arp-spoofing.xml
-		/etc/libvirt/nwfilter/no-ip-spoofing.xml
-		/etc/libvirt/nwfilter/clean-traffic.xml
-		/etc/libvirt/nwfilter/no-ip-multicast.xml
-		/etc/libvirt/qemu.conf
 		/etc/libvirt/libvirtd.conf
+		/etc/libvirt/lxc.conf
+		/etc/libvirt/qemu.conf
+		/etc/libvirt/qemu-lockd.conf
 		/etc/sasl2/libvirt.conf"
 	make_dirs="
 		/var/cache/libvirt/qemu 0755 root root
@@ -96,7 +78,6 @@ libvirt_package() {
 		/var/lib/libvirt/dnsmasq 0755 root root
 		/var/lib/libvirt/uml 0755 root root"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }