diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template
index 3aebdca292..6bdcef4fb3 100644
--- a/srcpkgs/geoclue2/template
+++ b/srcpkgs/geoclue2/template
@@ -1,30 +1,20 @@
 # Template file for 'geoclue2'
 pkgname=geoclue2
 version=2.1.10
-revision=1
+revision=2
+lib32disabled=yes
 wrksrc="geoclue-${version}"
 build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)"
+configure_args="--disable-static --with-dbus-service-user=geoclue2"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libudev-devel json-glib-devel libsoup-gnome-devel ModemManager-devel"
 depends="libsoup>=2.44"
-conf_file="/etc/geoclue/geoclue.conf"
+# Run the daemon under an unprileged user.
+system_accounts="geoclue2"
+conf_files="/etc/geoclue/geoclue.conf"
 short_desc="The Geoinformation Service (2.x series)"
 homepage="http://www.freedesktop.org/wiki/Software/GeoClue"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://www.freedesktop.org/software/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz"
 checksum=f1d7e7a9c60633d3d747f55fee848299114b3222a4d65e955c2cbcd297d01c68
-
-lib32disabled=yes
-# Run the daemon under an unprileged user.
-system_accounts="geoclue2"
-configure_args+=" --with-dbus-service-user=geoclue2"
-
-# Package build options
-build_options="gir"
-
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi