diff --git a/dbus/trunk/PKGBUILD b/dbus/trunk/PKGBUILD
index a23c5f6fbfe..bd5c7e8d22c 100644
--- a/dbus/trunk/PKGBUILD
+++ b/dbus/trunk/PKGBUILD
@@ -6,33 +6,27 @@
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
 pkgver=1.12.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
 license=(GPL custom)
 depends=(systemd-libs expat audit)
-makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)
-_commit=a0926ef86f413f18202ffa19cb1433b6ba00ac36  # tags/dbus-1.12.18^0
-source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit"
+makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen autoconf-archive)
+source=(https://dbus.freedesktop.org/releases/dbus/${pkgbase}-${pkgver}.tar.gz{,.asc}
         dbus-reload.hook)
-sha256sums=('SKIP'
+sha256sums=('64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306'
+            'SKIP'
             'd636205622d0ee3b0734360225739ef0c7ad2468a09489e6ef773d88252960f3')
-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'
-}
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90')  # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 prepare() {
-  cd dbus
+  cd dbus-"${pkgver}"
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd dbus
+  cd dbus-"${pkgver}"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -56,6 +50,7 @@ build() {
 }
 
 check() {
+  cd dbus-"${pkgver}"
   make -C dbus check
 }
 
@@ -65,7 +60,8 @@ package_dbus() {
   conflicts=(libdbus)
   replaces=(libdbus)
 
-  DESTDIR="$pkgdir" make -C dbus install
+  cd dbus-"${pkgver}"
+  DESTDIR="$pkgdir" make install
 
   rm -r "$pkgdir"/{etc,var}
 
@@ -73,18 +69,19 @@ package_dbus() {
   echo 'u dbus 81 "System Message Bus"' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
 
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 
   # Split docs
   mv "$pkgdir/usr/share/doc" "$srcdir"
 }
 
 package_dbus-docs() {
+  cd dbus-"${pkgver}"
   pkgdesc+=" (documentation)"
   depends=()
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
   mv doc "$pkgdir/usr/share"
 }