diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index f377da22f58..964cce0f862 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,10 +1,10 @@
 # Template file for 'gmime'
 pkgname=gmime
 version=2.6.20
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --disable-mono --enable-smime --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
 makedepends="glib-devel gpgme-devel"
 short_desc="GNOME Core mime parsing library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -13,6 +13,14 @@ homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
 checksum=e0a170fb264c2ae4cecd852f4e7aaddb8d58e8f3f0b569ce2d2a4704f55bdf65
 
+# 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
 	i686|x86_64|armv?l*)
 		configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
@@ -32,5 +40,8 @@ gmime-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 	}
 }