diff --git a/dbus/30-dbus b/dbus/30-dbus
deleted file mode 100644
index 42b3a5ff7..000000000
--- a/dbus/30-dbus
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
-  eval $(dbus-launch --sh-syntax --exit-with-session)
-fi
diff --git a/dbus/PKGBUILD b/dbus/PKGBUILD
index b2e42f661..85ff27268 100644
--- a/dbus/PKGBUILD
+++ b/dbus/PKGBUILD
@@ -1,56 +1,76 @@
 pkgbase=dbus
-pkgname=('dbus' 'libdbus')
-pkgver=1.10.12
+pkgname=(dbus dbus-docs)
+pkgver=1.12.12
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=('x86_64')
-license=('GPL' 'custom')
-makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz)
-md5sums=('bacef77336bbe588efa3124102d5fcdb')
+license=(GPL custom)
+depends=(libsystemd expat audit)
+makedepends=(systemd xmlto docbook-xsl python3 doxygen git autoconf-archive graphviz)
+_commit=d4f8423bbff9b3c5fca2d8009c28d1cff4652788  # tags/dbus-1.12.12^0
+source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit")
+sha256sums=('SKIP')
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie@collabora.co.uk>
+              '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+pkgver() {
+  cd dbus
+  git describe --tags | sed 's/^dbus-//;s/-/+/g'
+}
+
+
+prepare() {
+  cd dbus
+
+  # Reduce docs size
+  printf '%s\n' >>Doxyfile.in \
+    HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
+
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd dbus-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
-      --with-system-pid-file=/run/dbus/pid \
-      --with-system-socket=/run/dbus/system_bus_socket \
-      --with-console-auth-dir=/run/console/ \
-      --enable-inotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-systemd --enable-user-session
+  cd dbus
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    runstatedir=/run \
+    --libexecdir=/usr/lib/dbus-1.0 \
+    --with-system-socket=/run/dbus/system_bus_socket \
+    --with-dbus-session-bus-connect-address=unix:runtime=yes \
+    --with-dbus-user=dbus \
+    --enable-user-session \
+    --disable-static \
+    --without-x
   make
 }
 
-package_dbus(){
-  depends=('libdbus' 'expat')
-  optdepends=('libx11: dbus-launch support')
-  provides=('dbus-core')
-  conflicts=('dbus-core')
-  replaces=('dbus-core')
+package_dbus() {
+  provides=(libdbus)
+  conflicts=(libdbus)
+  replaces=(libdbus)
 
-  cd dbus-$pkgver
+  DESTDIR="$pkgdir" make -C dbus install
 
-  # Disable installation of libdbus
-  sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+  rm -r "$pkgdir/var/run"
 
-  make DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
 
-  rm -rf "${pkgdir}/var/run"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
+  # We have a pre-assigned uid (81)
+  echo 'u dbus 81 "System Message Bus"' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
 
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+  # Split docs
+  mv "$pkgdir/usr/share/doc" "$srcdir"
 }
 
-package_libdbus(){
-  pkgdesc="DBus library"
-  depends=('glibc')
+package_dbus-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
 
-  cd dbus-$pkgver
-  make DESTDIR="$pkgdir" -C dbus install
-  make DESTDIR="$pkgdir" install-data-am
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus/COPYING"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+
+  mv doc "$pkgdir/usr/share"
 }