diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index d4bd4d6b73..6fe7981f86 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -1,34 +1,40 @@
 # Template file for 'libxklavier'
 pkgname=libxklavier
 version=5.4
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config glib-devel $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libxkbfile-devel libxml2-devel libXi-devel
  xkeyboard-config iso-codes"
 depends="xkeyboard-config iso-codes"
 short_desc="Library providing high-level API for X Keyboard Extension"
-homepage="https://freedesktop.org/wiki/Software/LibXklavier/"
-license="LGPL-2.0-or-later"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://freedesktop.org/wiki/Software/LibXklavier/"
 distfiles="https://people.freedesktop.org/~svu/libxklavier-${version}.tar.bz2"
 checksum=17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320
 
 # 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
 
 libxklavier-devel_package() {
 	depends="libglib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }