diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index a700875a879..45454fd6698 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,23 +1,25 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
 version=2.2.4
-revision=1
+revision=2
 patch_args="-Np1"
 short_desc="The Cinnamon Settings Daemon"
 build_style=gnu-configure
-configure_args=" --disable-static --disable-schemas-compile
- --enable-systemd --disable-gconf"
+configure_args=" --disable-static --disable-schemas-compile --disable-gconf
+ $(vopt_enable systemd)"
 hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
- gettext-devel intltool which xmlto docbook-xml git"
+ gettext-devel intltool xmlto docbook-xml git"
 makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
- systemd-devel libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel 
- pulseaudio-devel libcanberra-devel colord-devel cups-devel nss-devel polkit-devel
- libgnomekbd-devel libxklavier-devel kbproto"
+ libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel nss-devel
+ pulseaudio-devel libcanberra-devel colord-devel cups-devel polkit-devel
+ libgnomekbd-devel libxklavier-devel kbproto $(vopt_if systemd systemd-devel)"
 depends="desktop-file-utils hicolor-icon-theme"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
 
+build_options="systemd"
+
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
 }