diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 59648a54164..d39bb026ca8 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,24 +1,27 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.30.0
+version=2.30.1
 revision=1
 build_style=meson
-hostmakedepends="pkg-config intltool dbus glib-devel $(vopt_if gir gobject-introspection)"
-makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel libXevie-devel dbus-devel"
+build_helper="gir"
+hostmakedepends="pkg-config intltool dbus glib-devel"
+makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel
+ libXevie-devel dbus-devel"
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b
+checksum=856f1f8f1bf0482a1bc275b18b9f28815d346bc4175004d37e175a1a0e50ca48
 
 # 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
+	i686-musl|x86_64-musl) build_options_default+=" gir" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd