diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
index 9bff9b556d3..fa43ae2b7ca 100644
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@@ -1,10 +1,11 @@
 # Template file for 'clutter-gtk'
 pkgname=clutter-gtk
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
+build_helper="gir"
 configure_args="$(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel clutter-devel"
 short_desc="GTK+3 bindings for the Clutter Toolkit"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -16,10 +17,11 @@ checksum=521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06
 # Package build options
 build_options="gir"
 
-# 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" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
 
 clutter-gtk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"