diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 7cb2c212cb8..1440181b23a 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -1,25 +1,27 @@
 # Template file for 'atk'
 pkgname=atk
 version=2.30.0
-revision=1
+revision=2
 build_style=meson
+build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="pkg-config glib-devel $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-homepage="http://www.gtk.org/"
 license="LGPL-2.1-or-later"
+homepage="http://www.gtk.org/"
 distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz"
 checksum=dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b
 
 # 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
 
 atk-devel_package() {
 	depends="${makedepends} atk>=${version}_${revision}"
@@ -27,6 +29,7 @@ atk-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove "usr/share/gir-*"
 		fi