diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 36d8bd4..059ba9c 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,16 +4,15 @@
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct libvirt-storage-rbd)
-pkgver=6.5.0
+pkgver=6.7.0
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('x86_64')
 url="https://libvirt.org/"
 license=('LGPL' 'GPL3') #libvirt_parthelper links to libparted which is GPL3 only
-install=libvirt.install
 depends=('libpciaccess' 'yajl' 'fuse2' 'gnutls' 'parted' 'libssh' 'libxml2' 'numactl' 'polkit')
 makedepends=('libxslt' 'python-docutils' 'lvm2' 'open-iscsi' 'libiscsi' 'ceph-libs' 'glusterfs'
-             'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'qemu-headless')
+             'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'qemu-headless' 'meson')
 checkdepends=('ebtables')
 optdepends=('libvirt-storage-gluster: Gluster storage backend'
             'libvirt-storage-iscsi-direct: iSCSI-direct storage backend'
@@ -86,47 +85,60 @@ backup=(
   'etc/sasl2/libvirt.conf'
 )
 source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc})
-sha256sums=('4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182'
+sha256sums=('655b9476c797cdd3bb12e2520acc37335e5299b2d56a5bb9ab3f55db40161342'
             'SKIP')
-validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F') # Daniel Veillard <veillard@redhat.com>
+validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com
 
 prepare() {
-  mkdir build
   cd "$pkgname-$pkgver"
-  sed -i 's|/sysconfig/|/conf.d/|g' \
-    src/remote/libvirtd.service.in \
-    tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
-    src/locking/virtlockd.service.in \
-    src/logging/virtlogd.service.in
+  { find . -name "*.service.in"; echo ./tools/{libvirt-guests.sh,virt-pki-validate}.in; } | \
+    xargs sed -i 's|/sysconfig/|/conf.d/|g'
   sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
-    src/qemu/qemu.conf \
-    src/qemu/test_libvirtd_qemu.aug.in
-
-  sed -i 's/notify/simple/' src/remote/libvirtd.service.in
+    src/qemu/{qemu.conf,test_libvirtd_qemu.aug.in}
+  # ZFS HACK
+  sed -i "s/'zfs'/'zic'/;s/'zpool'/'zic'/" meson.build
 }
 
 build() {
-  cd build
-  ZFS=/usr/bin/zfs ZPOOL=/usr/bin/zpool \
-  "../$pkgname-$pkgver/configure" \
-    --prefix=/usr \
-    "--libexec=/usr/lib/$pkgname" \
-    --sbindir=/usr/bin \
-    --with-runstatedir=/run \
-    --with-qemu-group=kvm
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  CFLAGS+=" -Wall" \
+  arch-meson "$pkgname-$pkgver" build \
+    -D apparmor=disabled \
+    -D hal=disabled \
+    -D netcf=disabled \
+    -D openwsman=disabled \
+    -D selinux=disabled \
+    -D wireshark_dissector=disabled \
+    -D driver_bhyve=disabled \
+    -D driver_hyperv=disabled \
+    -D driver_libxl=disabled \
+    -D driver_vz=disabled \
+    -D secdriver_apparmor=disabled \
+    -D secdriver_selinux=disabled \
+    -D storage_sheepdog=disabled \
+    -D storage_vstorage=disabled \
+    -D storage_zfs=enabled \
+    -D dtrace=disabled \
+    -D numad=disabled \
+    -D git_werror=disabled \
+    -D qemu_group=kvm \
+    -D runstatedir=/run
+
+  # ZFS HACK
+  sed -i '/ZIC/d' build/meson-config.h
+  echo '#define ZFS "/usr/bin/zfs"' >> build/meson-config.h
+  echo '#define ZPOOL "/usr/bin/zpool"' >> build/meson-config.h
+
+  meson compile -C build
 }
 
 check() {
-  cd build
-  make check
+  meson test -C build --print-errorlogs
 }
 
 package_libvirt() {
   provides=('libvirt.so' 'libvirt-admin.so' 'libvirt-lxc.so' 'libvirt-qemu.so')
-  cd build
-  make DESTDIR="$pkgdir" install
+  install=libvirt.install
+  DESTDIR="$pkgdir" meson install -C build
 
   mv "$pkgdir"/etc/{sysconfig,conf.d}
   mkdir "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
@@ -150,9 +162,10 @@ package_libvirt() {
   rm -f "$pkgdir/etc/libvirt/qemu/networks/autostart/default.xml"
 
   # move split modules
-  mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,gluster}.so "$pkgdir/../"
-  mv "$pkgdir/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so" "$pkgdir/../"
-  mv "$pkgdir/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so" "$pkgdir/../"
+  mkdir "$srcdir/split"
+  mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,gluster}.so "$srcdir/split"
+  mv "$pkgdir/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so" "$srcdir/split"
+  mv "$pkgdir/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so" "$srcdir/split"
 }
 
 package_libvirt-storage-gluster() {
@@ -161,8 +174,8 @@ package_libvirt-storage-gluster() {
   optdepends=()
   backup=()
 
-  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$pkgdir/../libvirt_storage_backend_gluster.so"
-  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-file" "$pkgdir/../libvirt_storage_file_gluster.so"
+  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$srcdir/split/libvirt_storage_backend_gluster.so"
+  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-file" "$srcdir/split/libvirt_storage_file_gluster.so"
 }
 
 package_libvirt-storage-iscsi-direct() {
@@ -171,7 +184,7 @@ package_libvirt-storage-iscsi-direct() {
   optdepends=()
   backup=()
 
-  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$pkgdir/../libvirt_storage_backend_iscsi-direct.so"
+  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$srcdir/split/libvirt_storage_backend_iscsi-direct.so"
 }
 
 package_libvirt-storage-rbd() {
@@ -180,5 +193,5 @@ package_libvirt-storage-rbd() {
   optdepends=()
   backup=()
 
-  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$pkgdir/../libvirt_storage_backend_rbd.so"
+  install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$srcdir/split/libvirt_storage_backend_rbd.so"
 }