diff --git a/modules.d/06dbus-broker/module-setup.sh b/modules.d/06dbus-broker/module-setup.sh
new file mode 100755
index 00000000..d22031bb
--- /dev/null
+++ b/modules.d/06dbus-broker/module-setup.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Prerequisite check(s) for module.
+check() {
+
+    # If the binary(s) requirements are not fulfilled
+    # return 1 to not include the binary.
+    require_binaries busctl || return 1
+    require_binaries dbus-broker || return 1
+    require_binaries dbus-broker-launch || return 1
+
+    # If the module dependency requirements are not fulfilled
+    # return 1 to not include the required module(s).
+    if ! dracut_module_included "systemd"; then
+        derror "dbus-broker needs systemd in the initramfs."
+        return 1
+    fi
+
+    if ! dracut_module_included "systemd-sysusers"; then
+        derror "dbus-broker needs systemd-sysusers in the initramfs."
+        return 1
+    fi
+
+    # dbus-broker conflicts with dbus.
+
+    if dracut_module_included "dbus"; then
+        derror "dbus-broker conflicts with dbus in the initramfs."
+        exit 1
+    fi
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on the systemd module.
+    echo systemd systemd-sysusers
+    # Return 0 to include the dependent systemd module in the initramfs.
+    return 0
+
+}
+
+# Install the required file(s) for the module in the initramfs.
+install() {
+
+    # Create dbus related directories.
+    inst_dir $dbus
+    inst_dir $dbusinterfaces
+    inst_dir $dbusservices
+    inst_dir $dbussession
+    inst_dir $dbussystem
+    inst_dir $dbussystemservices
+    inst_dir $dbusconfdir
+    inst_dir $dbusinterfacesconfdir
+    inst_dir $dbusservicesconfdir
+    inst_dir $dbussessionconfdir
+    inst_dir $dbussystemconfdir
+    inst_dir $dbussystemservicesconfdir
+
+    inst_multiple -o \
+        # Install the dbus user session configuration file.
+        $dbus/session.conf \
+        # Install the dbus system configuration file.
+        $dbus/system.conf \
+        # The systemd module should be providing this and
+        # depend on the dbus module. Added here until it does.
+        $dbussystem/org.freedesktop.systemd1.conf \
+        $dbusservicesconfdir/org.freedesktop.systemd1.service \
+        $dbussystemservices/org.freedesktop.systemd1.service \
+        # Install the dbus users and groups configuration file.
+        $sysusers/dbus.conf \
+        # Install the dbus-broker systemd journal message catalogs files.
+        $systemdcatalog/dbus-broker.catalog \
+        $systemdcatalog/dbus-broker-launch.catalog \
+        # Install the systemd type service unit for dbus-broker.
+        $systemdsystemunitdir/dbus-broker.service \
+        $systemduser/dbus-broker.service \
+        # Install the systemd type socket unit for dbus.
+        $systemdsystemunitdir/dbus.socket \
+        $systemduser/dbus.socket \
+        # Install the dbus target.
+        $systemdsystemunitdir/dbus.target.wants
+        # Install the binary executable(s) for dbus-broker.
+        busctl dbus-broker dbus-broker-launch
+
+    # Adjusting dependencies for initramfs in the dbus socket unit.
+    sed -i -e \
+        '/^\[Unit\]/aDefaultDependencies=no\
+        Conflicts=shutdown.target\
+        Before=shutdown.target
+        /^\[Socket\]/aRemoveOnStop=yes' \
+        "$initdir$systemdsystemunitdir/dbus.socket"
+
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            $dbusconfdir/session.conf \
+            $dbusconfdir/system.conf \
+            $sysusersconfdir/dbus.conf \
+            $systemdsystemconfdir/dbus.socket \
+            $systemdsystemconfdir/dbus.socket.d/*.conf \
+            $systemdsystemconfdir/dbus-broker.service \
+            $systemdsystemconfdir/dbus-broker.service.d/*.conf
+            ${NULL}
+    fi
+
+    # We need to make sure that systemd-tmpfiles-setup.service->dbus.socket
+    # will not wait for local-fs.target to start if swap is encrypted,
+    # this would make dbus wait the timeout for the swap before loading.
+    # This could delay sysinit services that are dependent on dbus.service.
+    sed -i -Ee \
+        '/^After/s/(After[[:space:]]*=.*)(local-fs.target[[:space:]]*)(.*)/\1-\.mount \3/' \
+        "$initdir$systemdsystemunitdir/systemd-tmpfiles-setup.service"
+}