diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 6a0eeef69c..e96e658f92 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,16 +1,18 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ui --enable-gtk3 --disable-python
- --disable-schemas-compile --enable-memconf
- --disable-schemas-install --enable-dconf --disable-gconf"
+ --disable-tests --disable-schemas-compile --enable-memconf
+ --disable-schemas-install --enable-dconf --disable-gconf
+ $(vopt_enable gir introspection) $(vopt_enable ibus_setup setup)"
 hostmakedepends="automake gettext-devel libtool pkg-config intltool
- dconf GConf python glib-devel"
+ dconf GConf python glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="dconf-devel>=0.13.90 librsvg-devel gtk+-devel gtk+3-devel
  vala-devel libnotify-devel hicolor-icon-theme iso-codes dbus-x11 python-xdg"
-depends="hicolor-icon-theme iso-codes dbus-x11 python-xdg"
+depends="hicolor-icon-theme iso-codes dbus-x11 python-xdg
+ $(vopt_if ibus_setup 'python-gobject>=3.12.1_3')"
 triggers="gtk-immodules gtk3-immodules"
 short_desc="Intelligent Input Bus"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -20,24 +22,17 @@ distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${vers
 checksum=ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6
 
 # Package build options
-build_options="gir"
+build_options="gir 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"
-fi
-
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
+	build_options_default="gir ibus_setup"
 fi
 
 pre_configure() {
 	autoreconf -fi
 }
-
 pre_install() {
 	vmkdir etc/dconf/db
 }