diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 2cd3d965176..e1b93a5db24 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,11 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-update-mime-database
 --disable-schemas-compile"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel>=3.8 gpgme-devel
  libnotify-devel libgnome-keyring-devel>=3.10 gnupg"
 depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg"
@@ -15,17 +15,32 @@ homepage="http://www.gnome.org"
 license="GPL-2, LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=5e3e82e647ac4fb74ed46b4fffbf89e80198f856e1509f5edcd47dd2751a4be0
-long_desc="
- $pkgname is a library used for prompting for PGP keys. It's likely that this
- library will become deprecated in the near future."
+
+# 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
 
 libcryptui-devel_package() {
-	depends="gtk+3-devel dbus-glib-devel libcryptui>=${version}"
+	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	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/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}