diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index d69df02950..8fe733eb4a 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,11 +1,12 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
 version=0.6.35
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static
+ ac_cv_file__etc_redhat_release=no ac_cv_file__etc_debian_version=no
  --with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="polkit-devel systemd-devel"
 make_dirs="
 	/var/lib/AccountsService/users 755 root root
@@ -16,10 +17,22 @@ homepage="http://cgit.freedesktop.org/accountsservice/"
 license="GPL-3"
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 checksum=65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038
-long_desc="
- The accountsservice project provides a set of D-Bus interfaces for
- querying and manipulating user account information and an implementation
- of these interfaces, based on the useradd, usermod and userdel commands."
+
+# 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
 
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -28,7 +41,9 @@ accountsservice-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 	}
 }