diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 233bd36ae2..c23bfd05ea 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -1,25 +1,27 @@
 # Template file for 'gupnp-dlna'
 pkgname=gupnp-dlna
 version=0.10.5
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="automake libtool pkg-config gobject-introspection"
-makedepends="gst-plugins-base1-devel vala-devel"
+hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)"
+makedepends="gst-plugins-base1-devel $(vopt_if vala vala)"
 short_desc="GUPnP DLNA"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://gupnp.org/"
-distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/${pkgname}/0.10/${pkgname}-${version}.tar.xz"
 checksum=123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a
 
 # 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
 
 pre_configure() {
 	autoreconf -fi
@@ -31,8 +33,11 @@ gupnp-dlna-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/gtk-doc
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 		vmove usr/lib/pkgconfig