diff --git a/common/shlibs b/common/shlibs
index ea9ead24c5..cb1872bd97 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -698,8 +698,8 @@ libsvn_swig_perl-1.so.0		subversion-perl		subversion-devel
 libsvn_swig_ruby-1.so.0		subversion-ruby		subversion-devel
 libjson-glib-1.0.so.0		json-glib		json-glib-devel
 liblxc.so.0			liblxc			lxc-devel
-libvirt.so			libvirt			libvirt-devel
-libvirt-qemu.so			libvirt			libvirt-devel
+libvirt.so.0			libvirt			libvirt-devel
+libvirt-qemu.so.0		libvirt			libvirt-devel
 libgdk-3.so.0			gtk+3			gtk+3-devel
 libgtk-3.so.0			gtk+3			gtk+3-devel
 libgailutil-3.so.0		gtk+3			gtk+3-devel
diff --git a/srcpkgs/libvirt/libvirt-devel.template b/srcpkgs/libvirt/libvirt-devel.template
index f4539e9d2e..9f31494fa7 100644
--- a/srcpkgs/libvirt/libvirt-devel.template
+++ b/srcpkgs/libvirt/libvirt-devel.template
@@ -5,31 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libcap-ng-devel
-Add_dependency run libnl-devel
-Add_dependency run gnutls-devel
-Add_dependency run libgcrypt-devel
-Add_dependency run libsasl-devel
-Add_dependency run xen-devel
-Add_dependency run libcurl-devel
-Add_dependency run libpcap-devel
-Add_dependency run libxml2-devel
-Add_dependency run libparted-devel
-Add_dependency run device-mapper-devel
-Add_dependency run dbus-devel
-Add_dependency run libudev-devel
-Add_dependency run libpciaccess-devel
-Add_dependency run avahi-libs-devel
-Add_dependency run readline-devel
-Add_dependency run libvirt
+Add_dependency run libvirt ">=$version"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/doc
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/doc/libvirt-${version} \
-		${DESTDIR}/usr/share/doc
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/doc/libvirt-${version} usr/share/doc
 }
diff --git a/srcpkgs/libvirt/libvirt-python.rshlibs b/srcpkgs/libvirt/libvirt-python.rshlibs
new file mode 100644
index 0000000000..4d25e11d57
--- /dev/null
+++ b/srcpkgs/libvirt/libvirt-python.rshlibs
@@ -0,0 +1,21 @@
+libvirt.so.0
+libcap-ng.so.0
+libyajl.so.2
+libdevmapper.so.1.02
+libdbus-1.so.3
+librt.so.1
+libavahi-common.so.3
+libavahi-client.so.3
+libgnutls.so.26
+libgcrypt.so.11
+libsasl2.so.2
+libssh2.so.1
+libcurl.so.4
+libpcap.so.1
+libnl.so.1
+libxml2.so.2
+libpthread.so.0
+libutil.so.1
+libdl.so.2
+libc.so.6
+libvirt-qemu.so.0
diff --git a/srcpkgs/libvirt/libvirt-python.template b/srcpkgs/libvirt/libvirt-python.template
index abafbcaa08..737a7e0ee1 100644
--- a/srcpkgs/libvirt/libvirt-python.template
+++ b/srcpkgs/libvirt/libvirt-python.template
@@ -5,23 +5,9 @@ long_desc="${long_desc}
 
  This package contains the Python language bindings."
 
-Add_dependency run glibc
-Add_dependency run libcap-ng
-Add_dependency run libnl
-Add_dependency run gnutls
-Add_dependency run libgcrypt
-Add_dependency run libsasl
-Add_dependency run xen
-Add_dependency run libcurl
-Add_dependency run libpcap
-Add_dependency run libxml2
 Add_dependency run python
-Add_dependency run libvirt
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/doc
-	mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/doc/libvirt-python* \
-		${DESTDIR}/usr/share/doc
+do_install() {
+	vmove "usr/lib/python*" usr/lib
+	vmove "usr/share/doc/libvirt-python*" usr/share/doc
 }
diff --git a/srcpkgs/libvirt/libvirt.rshlibs b/srcpkgs/libvirt/libvirt.rshlibs
new file mode 100644
index 0000000000..c70434df8e
--- /dev/null
+++ b/srcpkgs/libvirt/libvirt.rshlibs
@@ -0,0 +1,25 @@
+libcap-ng.so.0
+libyajl.so.2
+libdevmapper.so.1.02
+libdbus-1.so.3
+librt.so.1
+libavahi-common.so.3
+libavahi-client.so.3
+libgnutls.so.26
+libgcrypt.so.11
+libsasl2.so.2
+libssh2.so.1
+libcurl.so.4
+libpcap.so.1
+libnl.so.1
+libpthread.so.0
+libutil.so.1
+libxml2.so.2
+libdl.so.2
+libgcc_s.so.1
+libc.so.6
+libparted.so.2
+libblkid.so.1
+libudev.so.0
+libpciaccess.so.0
+libreadline.so.6
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3783fc5fb3..cc5a73be8b 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,12 +1,14 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=0.8.8
+version=0.9.12
 distfiles="http://libvirt.org/sources/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--without-hal"
+configure_args="--without-hal
+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"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=030aea3728917053555bec98d93d2855e8a603b758c0b2a5d57ac48b4f39e113
+checksum=298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7
 long_desc="
  libvirt is:
     * A toolkit to interact with the virtualization capabilities of recent
@@ -23,34 +25,15 @@ conf_files="
 /etc/libvirt/qemu.conf
 /etc/libvirt/lxc.conf
 /etc/libvirt/libvirtd.conf
+/etc/libvirt/libvirt.conf
 /etc/sasl2/libvirt.conf"
 
-Add_dependency run glibc
-Add_dependency run libcap-ng
-Add_dependency run libnl
-Add_dependency run gnutls
-Add_dependency run libgcrypt
-Add_dependency run libsasl
-Add_dependency run xen
-Add_dependency run libcurl
-Add_dependency run libpcap
-Add_dependency run libxml2
-Add_dependency run libparted
-Add_dependency run device-mapper
-Add_dependency run dbus-libs
-Add_dependency run libudev
-Add_dependency run libpciaccess
-Add_dependency run avahi-libs
-Add_dependency run readline
-Add_dependency run polkit
-
 Add_dependency build readline-devel
 Add_dependency build libcap-ng-devel
 Add_dependency build libnl-devel
 Add_dependency build libgcrypt-devel
 Add_dependency build gnutls-devel
 Add_dependency build libsasl-devel
-Add_dependency build xen-devel
 Add_dependency build libcurl-devel
 Add_dependency build libpcap-devel
 Add_dependency build libxml2-devel
@@ -61,3 +44,9 @@ Add_dependency build libudev-devel
 Add_dependency build libpciaccess-devel
 Add_dependency build avahi-libs-devel
 Add_dependency build polkit-devel
+Add_dependency build yajl-devel
+Add_dependency build python-devel
+Add_dependency build libssh2-devel
+
+Add_dependency full lvm2
+Add_dependency full parted