diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index df6afc5804..05095e7a93 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -1,11 +1,10 @@
 # Template file for 'gucharmap'
 pkgname=gucharmap
 version=3.10.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --enable-introspection"
-hostmakedepends="which pkg-config intltool gnome-doc-utils
- itstool gobject-introspection"
+configure_args="--disable-schemas-compile"
+hostmakedepends="which pkg-config intltool gnome-doc-utils itstool"
 makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="GNOME Unicode Charmap"
@@ -14,9 +13,22 @@ homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78
-long_desc="
- gucharmap is a Unicode/ISO10646 character map and font viewer for the
- GNOME platform. It supports anti-aliased, scalable fonts and more."
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# 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"
+fi
 
 gucharmap-devel_package() {
 	depends="gtk+3-devel ${sourcepkg}>=${version}_${revision}"
@@ -24,7 +36,9 @@ gucharmap-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove "usr/lib/*.so"
 	}
 }