diff --git a/srcpkgs/kde-workspace/files/kdm/run b/srcpkgs/kde-workspace/files/kdm/run
new file mode 100755
index 0000000000..bc7f3db979
--- /dev/null
+++ b/srcpkgs/kde-workspace/files/kdm/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec kdm -nodaemon
diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template
index e84fd74b1c..8b88d99bcc 100644
--- a/srcpkgs/kde-workspace/template
+++ b/srcpkgs/kde-workspace/template
@@ -3,7 +3,7 @@ _kdeversion=4.13.3
 
 pkgname=kde-workspace
 version=4.11.11
-revision=1
+revision=2
 short_desc="Provides the interface and basic tools for the KDE workspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL, LGPL, FDL"
@@ -33,6 +33,7 @@ conf_files="
 	/etc/pam.d/kde-np.pam
 	/etc/pam.d/kde.pam
 	/etc/pam.d/kscreensaver.pam"
+replaces="runit-void<20141013_2"
 system_accounts="kdm"
 kdm_homedir="/var/lib/kdm"
 make_dirs="
@@ -59,8 +60,10 @@ post_install() {
 	for f in kde kde-np kscreensaver; do
 		install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f}
 	done
-	vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system
-
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system
+	fi
+	vsv kdm
 	vmkdir usr/share/xsessions
 	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
 		${DESTDIR}/usr/share/xsessions
@@ -78,7 +81,6 @@ kde-workspace-devel_package() {
 		vmove usr/share/apps/cmake
 	}
 }
-
 kde-python_package() {
 	short_desc+=" - Python 2 bindings"
 	pycompile_module="PyKDE4"