diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template
index a2a98d591f..fb6df680ce 100644
--- a/srcpkgs/geoclue2/template
+++ b/srcpkgs/geoclue2/template
@@ -1,11 +1,11 @@
 # Template file for 'geoclue2'
 pkgname=geoclue2
 version=2.0.0
-revision=1
+revision=2
 wrksrc="geoclue-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="json-glib-devel libsoup-gnome-devel>=2.44"
 depends="libsoup>=2.44"
 short_desc="The Geoinformation Service (2.x series)"
@@ -14,7 +14,19 @@ license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://www.freedesktop.org/software/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz"
 checksum=4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1
-long_desc="
- Geoclue is a modular geoinformation service built on top of the D-Bus
- messaging system. The goal of the Geoclue project is to make creating
- location-aware applications as simple as possible."
+
+# 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