diff --git a/pkg.info b/pkg.info
index 696fde0..ad4b87a 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,10 +1,26 @@
 name: dbus
 description: Freedesktop.org message bus system
 version: 1.16.2
-revision: 3
+revision: 4
 url: https://www.freedesktop.org/wiki/Software/dbus
 license: AFL2.1 or GPL2-or-later
 architecture: any
-depends: ["expat","glibc","elogind","libcap"]
-make_depends: ["docbook-xsl-nons","glib","meson","python3","xmlto"]
 type: source
+depends:
+  - expat
+  - glibc
+  - elogind
+  - libcap
+  - sysusers
+make_depends:
+  - docbook-xsl-nons
+  - doxygen
+  - glib
+  - meson
+  - python3
+  - xmlto
+downloads:
+  - url: https://dbus.freedesktop.org/releases/dbus/dbus-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6beb7e2
diff --git a/source-files/sysusers b/source-files/sysusers
new file mode 100644
index 0000000..6d6e2e7
--- /dev/null
+++ b/source-files/sysusers
@@ -0,0 +1 @@
+u messagebus 18 "D-Bus Message Daemon User" /dev/null /usr/bin/false
diff --git a/source.sh b/source.sh
index 9297c67..a0bdfdd 100644
--- a/source.sh
+++ b/source.sh
@@ -2,43 +2,35 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://dbus.freedesktop.org/releases/dbus/dbus-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-
   meson setup --prefix=/usr          \
               --buildtype=release    \
               --wrap-mode=nofallback \
-              -Dsystemd=disabled ..
-  meson compile
+              -Ddbus_user=messagebus \
+              -Dinotify=enabled      \
+              -Dkqueue=disabled      \
+              -Dapparmor=disabled    \
+              -Dlaunchd=disabled     \
+              -Drelocation=disabled  \
+              -Dselinux=disabled     \
+              -Dsystemd=disabled     \
+              -Duser_session=false   \
+              build
+  meson compile -C build
 }
 
 # The check function is executed in the source directory
 # This function is used to run tests to verify the package has been compiled correctly
 check() {
-  cd build
-  
-  meson test --print-errorlogs
+  meson test -C build --print-errorlogs
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-  
-  meson install --destdir="$BPM_OUTPUT"
+  meson install -C build --destdir="$BPM_OUTPUT"
 
   # Fix dbus-daemon-launch-helper binary ownership and permissions
   chown 0:18 "$BPM_OUTPUT"/usr/libexec/dbus-daemon-launch-helper
@@ -56,6 +48,9 @@ package() {
   install -Dm755 "$BPM_WORKDIR"/dbus-reload.sh "$BPM_OUTPUT"/usr/sbin/dbus-reload
   install -Dm644 "$BPM_WORKDIR"/dbus-reload.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/dbus-reload.bpmhook
 
+  # Install sysusers file
+  install -Dm644 "$BPM_WORKDIR"/sysusers "$BPM_OUTPUT"/usr/lib/sysusers.d/dbus.conf
+
   # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/dbus/COPYING
 }