diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 84134bc381..a900cdaf24 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,24 +1,26 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
 version=2.2.2
-revision=1
+revision=2
 short_desc="The Cinnamon session handler"
 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 git"
+ gettext-devel intltool git"
 makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
- systemd-devel pangox-compat-devel cinnamon-desktop-devel libcanberra-devel"
+ systemd-devel pangox-compat-devel cinnamon-desktop-devel libcanberra-devel
+ upower0-devel $(vopt_if systemd systemd-devel)"
 depends="cinnamon-desktop 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}
 }
-
 pre_configure() {
-	./autogen.sh
+	NOCONFIGURE=1 ./autogen.sh
 }