diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index af0e0b58dd3..ea8a73528b8 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,13 +1,15 @@
 # Template file for 'gcr'
 pkgname=gcr
 version=3.28.1
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir"
 configure_args="$(vopt_enable gir introspection) --disable-update-mime
  --disable-update-icon-cache --disable-schemas-compile $(vopt_enable vala)"
-hostmakedepends="glib-devel $(vopt_if gir 'gobject-introspection')
- gtk-doc intltool pkg-config $(vopt_if vala 'vala-devel') libxslt"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel"
+hostmakedepends="glib-devel gtk-doc intltool pkg-config $(vopt_if vala 'vala')
+ libxslt"
+makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+ $(vopt_if vala vala)"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME crypto package"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -19,10 +21,11 @@ checksum=95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b
 # Package build options
 build_options="gir vala"
 
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vala"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 do_check() {
 	# requires X11 server