diff --git a/modules.d/01systemd-pstore/module-setup.sh b/modules.d/01systemd-pstore/module-setup.sh
new file mode 100755
index 0000000000..67034bbfa4
--- /dev/null
+++ b/modules.d/01systemd-pstore/module-setup.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# 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 the module can't be installed.
+    require_binaries "$systemdutildir"/systemd-pstore || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on other module(s).
+    echo systemd
+    # Return 0 to include the dependent module(s) in the initramfs.
+    return 0
+
+}
+
+# Install kernel module(s).
+installkernel() {
+    instmods efi-pstore
+}
+
+# Install the required file(s) and directories for the module in the initramfs.
+install() {
+
+    inst_dir /var/lib/systemd/pstore
+    inst_multiple -o \
+        "$tmpfilesdir/systemd-pstore.conf" \
+        "$systemdutildir"/systemd-pstore \
+        "$systemdsystemunitdir"/systemd-pstore.service \
+        "$systemdsystemunitdir/systemd-pstore.service.d/*.conf"
+
+    # Enable systemd type unit(s)
+    $SYSTEMCTL -q --root "$initdir" enable systemd-pstore.service
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            "$systemdutilconfdir"/pstore.conf \
+            "$systemdutilconfdir/pstore.conf.d/*.conf" \
+            "$systemdsystemconfdir"/systemd-pstore.service \
+            "$systemdsystemconfdir/systemd-pstore.service.d/*.conf"
+    fi
+
+}
diff --git a/modules.d/01systemd-tmpfiles/module-setup.sh b/modules.d/01systemd-tmpfiles/module-setup.sh
index 6c3a37a80e..63a64d4e64 100755
--- a/modules.d/01systemd-tmpfiles/module-setup.sh
+++ b/modules.d/01systemd-tmpfiles/module-setup.sh
@@ -30,7 +30,6 @@ install() {
     # Excluding "$tmpfilesdir/legacy.conf", belongs in seperated legacy module
     # Excluding "$tmpfilesdir/systemd-nologin.conf", belongs in seperated pam module
     # Excluding "$tmpfilesdir/systemd-nspawn.conf", belongs in seperated machined module
-    # Excluding "$tmpfilesdir/systemd-pstore.conf", belongs in seperated pstore module
     # Excluding "$tmpfilesdir/x11.conf", belongs in seperated x11 module
 
     inst_multiple -o \
diff --git a/pkgbuild/dracut.spec b/pkgbuild/dracut.spec
index 71b7421c00..a084a74aa0 100644
--- a/pkgbuild/dracut.spec
+++ b/pkgbuild/dracut.spec
@@ -329,6 +329,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{dracutlibdir}/modules.d/01systemd-journald
 %{dracutlibdir}/modules.d/01systemd-ldconfig
 %{dracutlibdir}/modules.d/01systemd-modules-load
+%{dracutlibdir}/modules.d/01systemd-pstore
 %{dracutlibdir}/modules.d/01systemd-repart
 %{dracutlibdir}/modules.d/01systemd-resolved
 %{dracutlibdir}/modules.d/01systemd-rfkill