diff --git a/srcpkgs/dbus-x11 b/srcpkgs/dbus-x11
new file mode 120000
index 00000000000..95a521b44c1
--- /dev/null
+++ b/srcpkgs/dbus-x11
@@ -0,0 +1 @@
+dbus
\ No newline at end of file
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
new file mode 100644
index 00000000000..edc2170e160
--- /dev/null
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -0,0 +1,20 @@
+# Template file for 'dbus-x11'.
+#
+short_desc="${short_desc} (X11 support)"
+long_desc="${long_desc}
+
+ This package contains the dbus-launch utility which is necessary for
+ packages using a D-Bus session bus."
+
+replaces="dbus<1.4.16_2"
+
+Add_dependency run glibc
+Add_dependency run dbus-libs
+Add_dependency run libX11
+
+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/template b/srcpkgs/dbus/template
index 8174383d65d..600abca3ac1 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.4.16
-revision=1
+revision=2
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -25,24 +25,15 @@ long_desc="
  this makes using the system quite simple."
 
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
-subpackages="$pkgname-devel $pkgname-libs"
+subpackages="dbus-devel dbus-libs dbus-x11"
 systemd_services="dbus.service"
 system_accounts="dbus"
 
 Add_dependency run glibc
 Add_dependency run expat
 Add_dependency run dbus-libs
-Add_dependency run libX11
 
 Add_dependency build coreutils
 Add_dependency build pkg-config
 Add_dependency build expat-devel
 Add_dependency build libX11-devel
-
-post_install()
-{
-	# install dbus-launch.
-	vinstall tools/dbus-launch 755 usr/bin
-	vinstall doc/dbus-launch.1 644 usr/share/man/man1
-	vinstall ${FILESDIR}/30-dbus-xinit 755 etc/X11/xinit/xinitrc.d 30-dbus
-}