diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 6c85ea8886c..accac3d3a45 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,13 +1,14 @@
 # Template file for 'gspell'
 pkgname=gspell
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)
  $(vopt_enable vala)"
-hostmakedepends="pkg-config glib-devel $(vopt_if gir 'gobject-introspection')
- $(vopt_if vala 'vala-devel')"
-makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
+makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
+ $(vopt_if vala vala)"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -17,10 +18,12 @@ checksum=819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5
 
 # 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
 
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"