diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 0aa99bf91fc..6337a7845f3 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=1.2.21
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-hal --with-storage-lvm --with-qemu-user=libvirt
  --with-qemu-group=libvirt --without-netcf --with-interface --disable-static"
@@ -31,34 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl) configure_args+=" --without-xen"; makedepends+=" libnuma-devel";;
 	*) configure_args+=" --without-xen";;
 esac
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc";;
+esac
 
-conf_files="
- /etc/libvirt/libvirt.conf
- /etc/libvirt/libvirtd.conf
- /etc/libvirt/lxc.conf
- /etc/libvirt/nwfilter/allow-arp.xml
- /etc/libvirt/nwfilter/allow-dhcp-server.xml
- /etc/libvirt/nwfilter/allow-dhcp.xml
- /etc/libvirt/nwfilter/allow-incoming-ipv4.xml
- /etc/libvirt/nwfilter/allow-ipv4.xml
- /etc/libvirt/nwfilter/clean-traffic.xml
- /etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
- /etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
- /etc/libvirt/nwfilter/no-arp-spoofing.xml
- /etc/libvirt/nwfilter/no-ip-multicast.xml
- /etc/libvirt/nwfilter/no-ip-spoofing.xml
- /etc/libvirt/nwfilter/no-mac-broadcast.xml
- /etc/libvirt/nwfilter/no-mac-spoofing.xml
- /etc/libvirt/nwfilter/no-other-l2-traffic.xml
- /etc/libvirt/nwfilter/no-other-rarp-traffic.xml
- /etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
- /etc/libvirt/nwfilter/qemu-announce-self.xml
- /etc/libvirt/qemu-lockd.conf
- /etc/libvirt/qemu.conf
- /etc/libvirt/qemu/networks/autostart/default.xml
- /etc/libvirt/qemu/networks/default.xml
- /etc/libvirt/virt-login-shell.conf
- /etc/libvirt/virtlockd.conf"
+conf_files="/etc/libvirt/nwfilter/*.xml /etc/libvirt/qemu/networks/*.xml /etc/libvirt/*.conf"
 make_dirs="
  /var/lib/libvirt/uml 0755 root root
  /var/lib/libvirt/qemu/nvram 0755 root root
@@ -73,8 +50,6 @@ make_dirs="
  /var/libvirt/boot 0755 root root
  /var/cache/libvirt/qemu 0755 root root"
 
-system_groups="libvirt"
-
 pre_configure() {
 	autoreconf -fi
 }