diff --git a/srcpkgs/gdm/files/gdm/run b/srcpkgs/gdm/files/gdm/run
new file mode 100755
index 00000000000..7c9aaaa1b9d
--- /dev/null
+++ b/srcpkgs/gdm/files/gdm/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+[ ! -d /run/gdm ] && mkdir -m0711 -p /run/gdm && chown root:gdm /run/gdm
+exec gdm
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ab444cee7d4..5133c97e546 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,18 +1,16 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static
  --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
  --with-screenshot-dir=/var/lib/gdm/greeter
- --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config itstool intltool which gnome-doc-utils"
-makedepends="
+ --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid"
+hostmakedepends="pkg-config itstool intltool gnome-doc-utils"
+makedepends="glib-devel iso-codes
  pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel
- libSM-devel libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme
- xorg-server gnome-session>=3.12 gnome-settings-daemon>=3.12"
+ libSM-devel libcanberra-devel dconf"
 conf_files="
 	/etc/gdm/custom.conf
 	/etc/pam.d/gdm
@@ -21,12 +19,12 @@ conf_files="
 	/etc/pam.d/gdm-password
 	/etc/pam.d/gdm-smartcard
 	/etc/pam.d/gdm-welcome"
+replaces="runit-void<20141013_2"
 # Create the 'gdm' system user/group.
 system_accounts="gdm"
 gdm_homedir="/var/lib/gdm"
-systemd_services="gdm.service off"
-depends="xrdb xorg-server hicolor-icon-theme
-	dconf>=0.20 gnome-session>=3.12 gnome-settings-daemon>=3.12"
+depends="iso-codes xrdb xorg-server hicolor-icon-theme
+ dconf>=0.20 gnome-session>=3.12 gnome-settings-daemon>=3.12"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -50,6 +48,7 @@ fi
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-systemd --enable-systemd-journal --with-initial-vt=1"
+	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
 	makedepends+=" systemd-devel"
 else
 	configure_args+=" --without-systemd --disable-systemd-journal --with-initial-vt=7"
@@ -61,8 +60,10 @@ post_install() {
 	for f in ${FILESDIR}/*.pam; do
 		vinstall ${f} 644 etc/pam.d ${f%.pam}
 	done
-	vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf
-
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf
+	fi
+	vsv gdm
 	chmod 1770 ${DESTDIR}/var/log/gdm
 }
 
@@ -72,7 +73,6 @@ libgdm_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 gdm-devel_package() {
 	depends="libgdm>=${version}_${revision}"
 	short_desc+=" - development files"