diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template
index aa0871f5a10..41b62418370 100644
--- a/srcpkgs/spice-vdagent/template
+++ b/srcpkgs/spice-vdagent/template
@@ -1,15 +1,12 @@
 # Template file for 'spice-vdagent'
 pkgname=spice-vdagent
 version=0.15.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-session-info=systemd --with-init-script=systemd"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel dbus-devel libXfixes-devel libXrandr-devel
- libXinerama-devel libpciaccess-devel spice-protocol>=0.12.6 systemd-devel
- desktop-file-utils"
+ libXinerama-devel libpciaccess-devel spice-protocol>=0.12.6 desktop-file-utils"
 depends="dbus"
-systemd_services="spice-vdagentd.service on"
 short_desc="Spice agent for Linux"
 homepage="http://spice-space.org/"
 license="GPL-3"
@@ -17,6 +14,15 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://www.spice-space.org/download/releases/${pkgname}-${version}.tar.bz2"
 checksum=5bae1747307c2f4195f6de97639391be7c6be6c5673fdcc9febed6faca22bd34
 
+# Package build options
+build_options="systemd"
+
+if [ "$build_option_systemd" ]; then
+	configure_args+=" --with-session-info=systemd --with-init-script=systemd"
+	makedepends+=" systemd-devel"
+	systemd_services="spice-vdagentd.service on"
+fi
+
 do_install() {
 	make DESTDIR=${DESTDIR} udevrulesdir=/usr/lib/udev/rules.d install
 }