diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 8ea5325..ec79a5d 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,45 +5,48 @@
 
 pkgbase=virt-manager
 pkgname=(virt-install virt-manager)
-pkgver=2.2.1
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="Desktop user interface for managing virtual machines"
 arch=('any')
 url="https://virt-manager.org/"
 license=('GPL')
-makedepends=('libosinfo' 'libvirt-python' 'python-gobject' 'python-requests' 'intltool')
-source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz")
-sha512sums=('aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a')
+makedepends=('python-docutils')
+checkdepends=('python-pytest' 'libosinfo' 'libvirt-python' 'python-gobject' 'python-requests' 'cpio' 'cdrtools')
+source=("https://virt-manager.org/download/sources/virt-manager/$pkgbase-$pkgver.tar.gz")
+sha256sums=('8afb58b1ee979e6ba9bdda3f98bd553b35981519660a649b38309d7924662f3d')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
+  python setup.py configure --default-hvs qemu,lxc
   python setup.py build
 }
 
+check() {
+  cd "$pkgbase-$pkgver"
+  pytest
+}
+
 package_virt-install() {
   pkgdesc="Console user interface for managing virtual machines"
   depends=('libosinfo' 'libvirt-python' 'python-gobject' 'python-requests')
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
   python setup.py --no-update-icon-cache --no-compile-schemas install --root "$pkgdir"
-  python -m compileall "${pkgdir}/usr/share/virt-manager"
-  python -O -m compileall "${pkgdir}/usr/share/virt-manager"
+  python -m compileall "$pkgdir/usr/share/virt-manager"
+  python -O -m compileall "$pkgdir/usr/share/virt-manager"
 
   # Split virt-manager
-  [[ -d $srcdir/virt-manager ]] && rm -r "$srcdir/virt-manager/"
-  mkdir "$srcdir"/virt-manager
-  mv "$pkgdir"/usr/bin/virt-manager \
-    "$pkgdir"/usr/share/{appdata,applications,glib-2.0,icons}/ \
-    "$pkgdir"/usr/share/man/man1/virt-manager.1 \
-    "$srcdir/virt-manager/"
+  [[ -d "$srcdir/virt-manager" ]] && rm -r "$srcdir/virt-manager/"
+  mkdir -p "$srcdir"/split/usr/{bin,share/{man/man1,virt-manager}}
+  mv "$pkgdir/usr/bin/virt-manager" "$srcdir"/split/usr/bin/
+  mv "$pkgdir"/usr/share/{applications,glib-2.0,icons,metainfo} "$srcdir"/split/usr/share/
+  mv "$pkgdir/usr/share/man/man1/virt-manager.1" "$srcdir"/split/usr/share/man/man1/
+  mv "$pkgdir"/usr/share/virt-manager/{icons,ui,virtManager} "$srcdir"/split/usr/share/virt-manager/
 }
 
 package_virt-manager() {
-  pkgdesc="Desktop user interface for managing virtual machines"
   depends=("virt-install=$pkgver" 'gtk-vnc' 'libvirt-glib' 'spice-gtk' 'vte3' 'python-cairo' 'gtksourceview4')
 
-  cd "$srcdir"/virt-manager
-  mkdir -p "$pkgdir"/usr/{bin,share/man/man1}
-  mv virt-manager "$pkgdir/usr/bin"
-  mv appdata applications glib-2.0 icons "$pkgdir"/usr/share
-  mv virt-manager.1 "$pkgdir"/usr/share/man/man1
+  mv -v split/* "$pkgdir/"
 }