diff --git a/srcpkgs/slim/files/slim.pam b/srcpkgs/slim/files/slim.pam
index be1b57ae451..530a3b03fe4 100644
--- a/srcpkgs/slim/files/slim.pam
+++ b/srcpkgs/slim/files/slim.pam
@@ -7,5 +7,6 @@ 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_systemd.so
+-session	optional	pam_ck_connector.so nox11
 -session	optional 	pam_gnome_keyring.so auto_start
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index 9a9d2ca033a..27bc8ffda4b 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -1,27 +1,30 @@
 # Template file for 'slim'
 pkgname=slim
 version=1.3.6
-revision=4
+revision=5
 lib32disabled=yes
 build_style=cmake
-configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+build_options="consolekit"
+build_options_default="consolekit"
+configure_args="-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"
+makedepends="libpng-devel>=1.6 freetype-devel libjpeg-turbo-devel libXrandr-devel
+ libXmu-devel libXft-devel pam-devel $(vopt_if consolekit ConsoleKit-devel)"
 conf_files="/etc/slim.conf /etc/pam.d/slim"
-systemd_services="slim.service off"
 short_desc="Desktop-independent graphical login manager for X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://slim.berlios.de/"
-distfiles="http://download.berlios.de/slim/slim-${version}.tar.gz"
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/slim/slim-${version}.tar.gz/d40d256394f9ef34cef34d2aa9cb52e6/slim-${version}.tar.gz"
 checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df
 
+if [ "$build_option_consolekit" ]; then
+	configure_args+=" -DUSE_CONSOLEKIT=1"
+fi
+
 pre_configure() {
 	sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
 }
-
 post_install() {
 	vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
-	sed -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt01|' \
-		-e 's|/var/run/slim.lock|/run/slim.lock|' -i ${DESTDIR}/etc/slim.conf
 }