diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 31269530385..432df83c3c4 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,11 +1,11 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.112
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-systemd=yes --with-authfw=pam
+configure_args="--disable-static --with-authfw=pam
  --with-systemdsystemunitdir=/usr/lib/systemd/system --with-os-type=void
- --with-mozjs=mozjs-17.0 --enable-libsystemd-login=yes"
+ --with-mozjs=mozjs-17.0"
 short_desc="Authorization Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/polkit"
@@ -14,19 +14,20 @@ distfiles="http://www.freedesktop.org/software/polkit/releases/polkit-${version}
 checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
 
 hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
-makedepends="libglib-devel expat-devel pam-devel systemd-devel mozjs17-devel shadow"
-depends="shadow"
+makedepends="libglib-devel expat-devel pam-devel mozjs17-devel"
 system_accounts="polkitd"
 
 # Package build options
-build_options="gir"
+build_options="gir systemd"
+build_options_default="systemd"
 desc_option_gir="Enable support for building gobject introspection data"
+desc_option_systemd="Enable support for systemd"
 
 # Disable gir for cross builds.
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection"
 else
-	build_options_default="gir"
+	build_options_default+=" gir"
 fi
 
 if [ "$build_option_gir" ]; then
@@ -36,6 +37,13 @@ else
 	configure_args+=" --disable-introspection"
 fi
 
+if [ "$build_option_systemd" ]; then
+	configure_args+=" --enable-systemd --enable-libsystemd-login"
+	makedepends+=" systemd-devel"
+else
+	configure_args+=" --disable-systemd --disable-libsystemd-login"
+fi
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi