diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index f68a5beb92..cc3217223b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -2,12 +2,14 @@
 pkgname=gnome-session
 version=3.14.0
 revision=1
+build_options="systemd"
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--disable-schemas-compile $(vopt_enable systemd)"
 hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
-makedepends="upower-devel json-glib-devel gtk+3-devel libSM-devel
+makedepends="upower0-devel json-glib-devel gtk+3-devel libSM-devel
  startup-notification-devel libXtst-devel dbus-glib-devel
- gsettings-desktop-schemas-devel>=3.14 gnome-desktop-devel>=3.14"
+ gsettings-desktop-schemas-devel>=3.14 gnome-desktop-devel>=3.14
+ $(vopt_if systemd systemd-devel)"
 depends="gsettings-desktop-schemas>=3.14 dconf>=0.20 alsa-plugins-pulseaudio
  hicolor-icon-theme desktop-file-utils"
 short_desc="GNOME session management utilities"
@@ -16,13 +18,3 @@ homepage="http://www.gnome.org"
 license="GPL-2, LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184
-
-# Package build options
-build_options="systemd"
-
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
-fi