diff --git a/srcpkgs/libsecret/template b/srcpkgs/libsecret/template
index bde1b263f9..f39ba1b64c 100644
--- a/srcpkgs/libsecret/template
+++ b/srcpkgs/libsecret/template
@@ -3,11 +3,11 @@ pkgname=libsecret
 version=0.18.7
 revision=1
 build_style=gnu-configure
+build_helper="gir"
 configure_args="$(vopt_enable gir introspection) --disable-static
- --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="glib-devel gtk-doc pkg-config libxslt
- $(vopt_if gir 'gobject-introspection')"
-makedepends="libgcrypt-devel vala-devel"
+ --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr $(vopt_enable vala)"
+hostmakedepends="glib-devel gtk-doc pkg-config libxslt $(vopt_if vala vala)"
+makedepends="libgcrypt-devel $(vopt_if vala vala) libglib-devel"
 short_desc="GObject based library for accessing the Secret Service API"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -16,12 +16,13 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=0d66fe1fc4561b3e046ee281d7c5a703a9baac88a8c4fb42ebc739d31dabd487
 
 # 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
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 libsecret-devel_package() {
 	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
@@ -33,6 +34,8 @@ libsecret-devel_package() {
 		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
 	}