diff --git a/srcpkgs/lxdm/files/lxdm.pam b/srcpkgs/lxdm/files/lxdm.pam
index f5159817c06..76b8869a251 100644
--- a/srcpkgs/lxdm/files/lxdm.pam
+++ b/srcpkgs/lxdm/files/lxdm.pam
@@ -1,11 +1,7 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
--auth		optional	pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
--session 	optional 	pam_systemd.so
--session	optional	pam_ck_connector.so nox11
--session 	optional	pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
+#%PAM-1.0
+auth        include     system-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-login
+password    include     system-login
+session     include     system-login
+-session    optional    pam_gnome_keyring.so auto_start
diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template
index 72de37a05df..d6d727976a1 100644
--- a/srcpkgs/lxdm/template
+++ b/srcpkgs/lxdm/template
@@ -1,13 +1,12 @@
 # Template file for 'lxdm'
 pkgname=lxdm
 version=0.5.0
-revision=3
+revision=4
 build_style=gnu-configure
-build_options="consolekit"
-build_options_default="consolekit"
-configure_args="$(vopt_enable consolekit) --with-pam"
+build_options="systemd"
+configure_args="$(vopt_if systemd --disable-consolekit --enable-consolekit) --with-pam"
 hostmakedepends="pkg-config intltool"
-makedepends="pam-devel gtk+-devel iso-codes $(vopt_if consolekit ConsoleKit-devel)"
+makedepends="pam-devel gtk+-devel iso-codes $(vopt_if systemd '' ConsoleKit-devel)"
 conf_files="
 	/etc/lxdm/LoginReady
 	/etc/lxdm/PostLogin
@@ -18,7 +17,6 @@ conf_files="
 	/etc/lxdm/Xsession
 	/etc/lxdm/lxdm.conf
 	/etc/pam.d/lxdm"
-replaces="runit-void<20141013_2"
 system_groups="lxdm"
 short_desc="GUI login manager for LXDE"
 maintainer="Juan RP <xtraeme@gmail.com>"