diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index 4ce6d05926c..1573db377fc 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,12 +1,12 @@
 # Template file for 'gcr'
 pkgname=gcr
 version=3.12.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-introspection --disable-update-mime
+configure_args="--disable-update-mime
  --disable-update-icon-cache --disable-schemas-compile"
-hostmakedepends="which pkg-config intltool gnome-doc-utils
- gobject-introspection libtasn1-tools gnupg perl-XML-Parser"
+hostmakedepends="libtool which pkg-config intltool gnome-doc-utils
+ libtasn1-tools gnupg perl-XML-Parser"
 makedepends="gtk+3-devel p11-kit-devel libgcrypt-devel vala-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="GNOME crypto package"
@@ -16,6 +16,25 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
 checksum=9d561d0b0a43aaad55fc1d464b3ee3e1687a5021e444f1bbdce3ae624518de77
 
+# 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
+
+pre_configure() {
+	libtoolize -f
+}
 post_install() {
 	vinstall ${FILESDIR}/10-gcr-memlock.conf 644 etc/security/limits.d
 }
@@ -27,9 +46,11 @@ gcr-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
 		vmove "usr/lib/*.so"
+		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }