diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index be3b6269398..f8f1a9db957 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -4,11 +4,12 @@ version=0.54.3
 revision=1
 wrksrc="vte-${version}"
 build_style=gnu-configure
-configure_args="--disable-static
- $(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')"
+build_helper="gir"
+configure_args="--disable-static $(vopt_enable gir introspection)
+ $(vopt_enable vala)"
 hostmakedepends="glib-devel gnome-doc-utils gperf intltool pkg-config
- $(vopt_if gir 'gobject-introspection vala-devel')"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel"
+ $(vopt_if vala vala)"
+makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala)"
 depends="vte"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -19,12 +20,19 @@ checksum=693682145025c2af72d1070afaecba111351e747b4ba8f4a9d246b139f44ebfd
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="
+
 # Package build options
-build_options="gir"
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options="gir vala"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
+
+pre_build() {
+	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs"
+}
 
 vte3-devel_package() {
 	depends="gnutls-devel gtk+3-devel pcre2-devel vte3>=${version}_${revision}"
@@ -36,6 +44,9 @@ vte3-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		vmove usr/share/gtk-doc
 	}
 }