diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template
index ca3fff40f12..f762b89c9a4 100644
--- a/srcpkgs/ConsoleKit/template
+++ b/srcpkgs/ConsoleKit/template
@@ -1,7 +1,7 @@
 # Template file for 'ConsoleKit'
 pkgname=ConsoleKit
 version=0.4.5
-revision=2
+revision=3
 distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-docbook-docs --enable-pam-module
@@ -19,7 +19,6 @@ long_desc="
 
 systemd_services="console-kit-daemon.service"
 conf_files="/etc/logrotate.d/ConsoleKit"
-keep_empty_dirs=yes
 subpackages="$pkgname-devel $pkgname-x11"
 
 Add_dependency run glibc
@@ -42,13 +41,13 @@ Add_dependency build zlib-devel
 
 post_install()
 {
-	install -d ${DESTDIR}/usr/lib/ConsoleKit/run-session.d
-	install -m755 ${FILESDIR}/pam-foreground-compat.ck \
-		${DESTDIR}/usr/lib/ConsoleKit/run-session.d
-	install -d ${DESTDIR}/etc/ConsoleKit/run-seat.d
-	install -d ${DESTDIR}/etc/ConsoleKit/run-session.d
-
-	install -D -m644 ${FILESDIR}/ck.logrotate \
-		${DESTDIR}/etc/logrotate.d/ConsoleKit
-	rm -rf ${DESTDIR}/var/run
+	vinstall ${FILESDIR}/pam-foreground-compat.ck 755 \
+		usr/lib/${pkgname}/run-session.d
+	for f in seat session; do
+		vmkdir etc/${pkgname}/run-${f}.d
+		touch ${DESTDIR}/etc/${pkgname}/run-${f}.d/.owned
+	done
+	vmkdir usr/lib/${pkgname}/run-seat.d
+	touch ${DESTDIR}/usr/lib/${pkgname}/run-seat.d/.owned
+	vinstall ${FILESDIR}/ck.logrotate 644 etc/logrotate.d ConsoleKit
 }