diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
index 94e96a6411d..f4920c6dd63 100644
--- a/srcpkgs/dbus/dbus-x11.template
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -10,5 +10,4 @@ long_desc="${long_desc}
 do_install() {
 	vmove usr/bin/dbus-launch usr/bin
 	vmove usr/share/man/man1/dbus-launch.1 usr/share/man/man1
-	vinstall ${FILESDIR}/30-dbus-xinit 755 etc/X11/xinit/xinitrc.d 30-dbus
 }
diff --git a/srcpkgs/dbus/files/30-dbus-xinit b/srcpkgs/dbus/files/30-dbus-xinit
deleted file mode 100644
index 877bb43a4a1..00000000000
--- a/srcpkgs/dbus/files/30-dbus-xinit
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
-fi
-
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 97d833edd95..538e556f11d 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,14 +1,15 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.6.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
---disable-dnotify --enable-inotify --with-dbus-user=dbus --disable-tests
---disable-doxygen-docs --disable-xml-docs --enable-systemd
---with-systemdsystemunitdir=/usr/lib/systemd/system --enable-epoll
---disable-asserts --disable-static"
-makedepends="pkg-config expat-devel libX11-devel systemd-devel"
+ --disable-dnotify --enable-inotify --with-dbus-user=dbus --disable-tests
+ --disable-doxygen-docs --disable-xml-docs --disable-static --enable-epoll
+ --disable-asserts --with-system-socket=/run/dbus/system_bus_socket
+ --with-system-pid-file=/run/dbus/pid --with-console-auth-dir=/run/console/
+ --with-systemdsystemunitdir=/usr/lib/systemd/system"
+makedepends="pkg-config expat-devel libX11-devel"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 subpackages="dbus-devel dbus-libs dbus-x11"
 system_accounts="dbus"