diff --git a/0061-multipath-fix-systemd-timers-in-the-initramfs.patch b/0061-multipath-fix-systemd-timers-in-the-initramfs.patch
new file mode 100644
index 0000000..2d7f6d7
--- /dev/null
+++ b/0061-multipath-fix-systemd-timers-in-the-initramfs.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Fri, 5 Aug 2022 18:16:03 -0500
+Subject: [PATCH] multipath: fix systemd timers in the initramfs
+
+The systemd timers created for "find_multipaths smart" conflict with
+shutdown.target, but not with initrd-cleanup.service.  This can make
+these timers trigger after the inirtd has started shutting down,
+restarting multipathd (which then stops initrd-cleanup.service, since it
+conflicts).  To avoid this, make sure the timers and the unit they
+trigger conflict with inird-cleanup.service. Also don't make them start
+multipathd.  "multipath -u" will not return "maybe" if multipathd isn't
+running or set to run, and since we no longer wait for udev-settle,
+multipathd starts up pretty quickly, so it shouldn't be a problem to
+not trigger it here.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+---
+ multipath/multipath.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/multipath/multipath.rules b/multipath/multipath.rules
+index 0486bf70..68c30644 100644
+--- a/multipath/multipath.rules
++++ b/multipath/multipath.rules
+@@ -72,7 +72,7 @@ ENV{.SAVED_FM_WAIT_UNTIL}=="?*", GOTO="pretend_mpath"
+ #
+ # We must trigger an "add" event because LVM2 will only act on those.
+ 
+-RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Wants=multipathd.service --property After=multipathd.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger --action=add $sys$devpath"
++RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property Conflicts=initrd-cleanup.service --timer-property Before=initrd-cleanup.service --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Conflicts=initrd-cleanup.service --property Before=initrd-cleanup.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger --action=add $sys$devpath"
+ 
+ LABEL="pretend_mpath"
+ ENV{DM_MULTIPATH_DEVICE_PATH}="1"
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 37fb28a..c137741 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,6 +1,6 @@
 Name:    device-mapper-multipath
 Version: 0.8.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
 License: GPLv2
 URL:     http://christophe.varoqui.free.fr/
@@ -70,6 +70,7 @@ Patch0057: 0057-updated-HPE-MSA-builtin-config.patch
 Patch0058: 0058-libmultipath-unset-detect_checker-for-clariion-Unity.patch
 Patch0059: 0059-multipathd-Add-missing-ctype-include.patch
 Patch0060: 0060-multipathd-replace-libreadline-with-libedit.patch
+Patch0061: 0061-multipath-fix-systemd-timers-in-the-initramfs.patch
 
 
 # runtime
@@ -270,6 +271,10 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Wed Aug 24 2022 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-12
+- Add 0061-multipath-fix-systemd-timers-in-the-initramfs.patch
+- Resolves: bz #2121277
+
 * Fri Aug 19 2022 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-11
 - Add 0059-multipathd-Add-missing-ctype-include.patch
 - Add 0060-multipathd-replace-libreadline-with-libedit.patch