diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
index 20bf69490a8..ea510716740 100644
--- a/srcpkgs/gmime3/template
+++ b/srcpkgs/gmime3/template
@@ -4,10 +4,12 @@ version=3.2.3
 revision=3
 wrksrc="gmime-${version}"
 build_style=gnu-configure
-configure_args="--disable-static --enable-crypto"
-hostmakedepends="pkg-config $(vopt_if gir gobject-introspection)
- $(vopt_if vala vala-devel)"
-makedepends="glib-devel gpgme-devel libidn2-devel"
+build_helper="gir"
+configure_args="--disable-static --enable-crypto $(vopt_enable vala)
+ $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config $(vopt_if vala vala)"
+makedepends="glib-devel gpgme-devel libidn2-devel
+ $(vopt_if vala vala)"
 checkdepends="gnupg2"
 short_desc="GNOME Core mime parsing library"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
@@ -17,12 +19,13 @@ distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
 checksum=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311
 
 # Package build options
-build_options+="gir vala"
+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
 
 case "$XBPS_TARGET_MACHINE" in
 	i686|x86_64|armv?l*|aarch64*)
@@ -44,7 +47,7 @@ gmime3-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-*"
+			vmove usr/share/gir-1.0
 		fi
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala