diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 9aa27cf9304..d35fa76aea1 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,17 +1,19 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.19
-revision=2
+revision=3
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --enable-python2 --disable-tests
  --disable-schemas-compile --enable-memconf --disable-schemas-install
  --enable-dconf --disable-gconf --disable-emoji-dict --disable-unicode-dict
  --with-python=/usr/bin/python2 $(vopt_enable gir introspection)
- $(vopt_enable ibus_setup setup)"
+ $(vopt_enable ibus_setup setup) $(vopt_enable vala)"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool
- dconf python glib-devel $(vopt_if gir gobject-introspection)"
+ dconf python glib-devel $(vopt_if vala vala)"
 makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes
- json-glib-devel libnotify-devel librsvg-devel python-xdg"
+ json-glib-devel libnotify-devel librsvg-devel python-xdg
+ $(vopt_if vala vala)"
 depends="hicolor-icon-theme iso-codes dbus-x11 python-xdg
  $(vopt_if ibus_setup 'python-gobject>=3.12.1_3')"
 short_desc="Intelligent Input Bus"
@@ -22,13 +24,14 @@ distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${vers
 checksum=4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429
 
 # Package build options
-build_options="gir ibus_setup"
+build_options="gir vala ibus_setup"
 desc_option_ibus_setup="Enable support for building the ibus setup UI"
 
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir ibus_setup"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala ibus_setup" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala ibus_setup" ;;
+esac
 
 pre_configure() {
 	autoreconf -fi
@@ -48,6 +51,8 @@ ibus-devel_package() {
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}