diff --git a/srcpkgs/slim/files/slim.pam b/srcpkgs/slim/files/slim.pam
index 530a3b03fe..1ab7fb0911 100644
--- a/srcpkgs/slim/files/slim.pam
+++ b/srcpkgs/slim/files/slim.pam
@@ -1,12 +1,7 @@
 #%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
--session	optional	pam_ck_connector.so nox11
--session	optional 	pam_gnome_keyring.so auto_start
+
+auth        include     system-local-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-local-login
+session     include     system-local-login
+-session    optional    pam_gnome_keyring.so auto_start
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index c1af29b48d..c5d2c52dfb 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -1,18 +1,16 @@
 # Template file for 'slim'
 pkgname=slim
 version=1.3.6
-revision=7
+revision=8
 lib32disabled=yes
 build_style=cmake
-build_options="consolekit"
-build_options_default="consolekit"
-configure_args="$(vopt_if consolekit -DUSE_CONSOLEKIT=1) -DUSE_PAM=yes
+build_options="systemd"
+configure_args="$(vopt_if systemd '-DUSE_CONSOLEKIT=0' '-DUSE_CONSOLEKIT=1') -DUSE_PAM=yes
  -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
 hostmakedepends="cmake pkg-config"
 makedepends="libpng-devel>=1.6 freetype-devel libjpeg-turbo-devel libXrandr-devel
- libXmu-devel libXft-devel pam-devel $(vopt_if consolekit ConsoleKit-devel)"
+ libXmu-devel libXft-devel pam-devel $(vopt_if systemd systemd-devel ConsoleKit-devel)"
 conf_files="/etc/slim.conf /etc/pam.d/slim"
-replaces="runit-void<20141013_2"
 short_desc="Desktop-independent graphical login manager for X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"