diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template
index 72918e340be..53a6eec6ce9 100644
--- a/srcpkgs/gupnp-av/template
+++ b/srcpkgs/gupnp-av/template
@@ -1,11 +1,12 @@
 # Template file for 'gupnp-av'
 pkgname=gupnp-av
 version=0.12.11
-revision=2
+revision=3
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
-makedepends="gupnp-devel $(vopt_if gir 'gobject-introspection vala-devel')"
+hostmakedepends="pkg-config $(vopt_if vala vala)"
+makedepends="gupnp-devel $(vopt_if vala vala)"
 short_desc="Library to ease handling and implementation of UPnP A/V profiles"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -14,20 +15,27 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc
 
 # Package build options
-build_options="gir"
+build_options="gir vala"
 
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl|x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 gupnp-av-devel_package() {
-	depends="gupnp-devel>=0.20.1_2 ${sourcepkg}>=${version}_${revision}"
+	depends="gupnp-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }