diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index baafcb82f54..a79a6ffd890 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-cups
- --disable-schemas-compile --enable-systemd --disable-packagekit"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
+ --disable-schemas-compile --disable-packagekit"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl"
 makedepends="geocode-glib-devel colord-devel>=1.1.7 libxklavier-devel
  gtk+3-devel libcanberra-devel pulseaudio-devel nss-devel libnotify-devel
  startup-notification-devel gnome-desktop-devel>=3.12 libgnomekbd-devel
- xf86-input-wacom-devel libwacom-devel>=0.7 systemd-devel librsvg-devel
- ibus-devel>=1.5 cups-devel libgudev-devel upower-devel>=0.99 polkit-devel
+ xf86-input-wacom-devel libwacom-devel>=0.7 librsvg-devel
+ ibus-devel>=1.5 cups-devel libgudev-devel upower-devel polkit-devel
  libgweather-devel>=3.12 geoclue2>=2.1"
 depends="geoclue2>=2.1 pulseaudio hicolor-icon-theme"
 short_desc="GNOME settings daemon"
@@ -20,6 +20,26 @@ license="GPL-3"
 distfiles="${GNOME_SITE}/$pkgname/3.12/$pkgname-$version.tar.xz"
 checksum=e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f
 
+# Package build options
+build_options="gir systemd"
+build_options_default="systemd"
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
+if [ "$build_option_systemd" ]; then
+	# XXX hard dependency on upower
+	depends+=" upower"
+fi
+
 gnome-settings-daemon-devel_package() {
 	depends="libglib-devel"
 	short_desc+=" - development files"