diff --git a/PKGBUILD b/PKGBUILD
index 02b05c6194b4fb7861da4e48047574d1eead3878..d8630ef7a77c0a3261fcaa5f91a74a0383d48e54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('manjaro-tools-base-git'
          'manjaro-tools-iso-git'
          'manjaro-tools-yaml-git')
 pkgbase=manjaro-tools-git
-pkgver=r3009.18b93d6
+pkgver=r3016.263d640
 pkgrel=1
 pkgdesc="Development tools for Manjaro Linux"
 arch=('any')
@@ -19,8 +19,12 @@ url="https://gitlab.manjaro.org/tools/development-tools/manjaro-tools"
 license=('GPL')
 groups=('manjaro-tools')
 makedepends=('git' 'docbook2x')
-source=("git+$url.git#branch=${_branch}")
-sha256sums=('SKIP')
+source=("git+$url.git#branch=${_branch}"
+        'etc-pacman.d-gnupg.mount'
+        'pacman-init.service')
+sha256sums=('SKIP'
+            'b6d14727ec465bb66d0a0358163b1bbfafcb4eaed55a0f57c30aabafae7eed68'
+            '65d8bdccdcccb64ae05160b5d1e7f3e45e1887baf89dda36c1bd44c62442f91b')
 
 pkgver() {
     cd "${srcdir}/${pkgbase%-git}"
@@ -53,6 +57,10 @@ package_manjaro-tools-base-git() {
 
     cd "${srcdir}/${pkgbase%-git}"
     make PREFIX=/usr DESTDIR="${pkgdir}" install_base
+
+    # install pacman-init
+    install -Dm644 $srcdir/etc-pacman.d-gnupg.mount $pkgdir/usr/lib/systemd/system/etc-pacman.d-gnupg.mount
+    install -m644 $srcdir/pacman-init.service $pkgdir/usr/lib/systemd/system/pacman-init.service
 }
 
 package_manjaro-tools-pkg-git() {
diff --git a/etc-pacman.d-gnupg.mount b/etc-pacman.d-gnupg.mount
new file mode 100644
index 0000000000000000000000000000000000000000..4eab5513702f31d6ddbdf140fcda4a599bf58c7a
--- /dev/null
+++ b/etc-pacman.d-gnupg.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=Temporary /etc/pacman.d/gnupg directory
+
+[Mount]
+What=tmpfs
+Where=/etc/pacman.d/gnupg
+Type=tmpfs
+Options=mode=0755
diff --git a/pacman-init.service b/pacman-init.service
new file mode 100644
index 0000000000000000000000000000000000000000..45485a5b030d00ad4f6d0df58df9ca1fcc03fa87
--- /dev/null
+++ b/pacman-init.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Initialize Pacman keyring
+Wants=haveged.service
+After=haveged.service
+Requires=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/pacman-key --init
+ExecStart=/usr/bin/pacman-key --populate archlinux manjaro
+
+[Install]
+WantedBy=multi-user.target