diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 910b0c42cd9..29bf285d91f 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,13 +1,13 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.10.1
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel"
+configure_args="--disable-static $(vopt_enable systemd)"
+hostmakedepends="pkg-config intltool xfce4-dev-tools glib-devel gettext-devel iceauth"
 makedepends="libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel
- libwnck2-devel xfce4-panel-devel libSM-devel systemd-devel polkit-devel
- iceauth desktop-file-utils hicolor-icon-theme"
+ libwnck2-devel xfce4-panel-devel libSM-devel polkit-devel
+ $(vopt_if systemd systemd-devel)"
 depends="iceauth hicolor-icon-theme desktop-file-utils"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
 short_desc="The session manager for the XFCE desktop environment"
@@ -20,13 +20,6 @@ checksum=0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83
 # Package build options
 build_options="systemd"
 
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
-fi
-
 pre_configure() {
 	NOCONFIGURE=1 xdt-autogen
 }