diff --git a/nfs-utils-2.3.3-systemd-rpcstatd.patch b/nfs-utils-2.3.3-systemd-rpcstatd.patch
new file mode 100644
index 0000000..fa0931f
--- /dev/null
+++ b/nfs-utils-2.3.3-systemd-rpcstatd.patch
@@ -0,0 +1,13 @@
+diff -up nfs-utils-2.3.3/systemd/rpc-statd.service.orig nfs-utils-2.3.3/systemd/rpc-statd.service
+--- nfs-utils-2.3.3/systemd/rpc-statd.service.orig	2018-09-06 14:09:08.000000000 -0400
++++ nfs-utils-2.3.3/systemd/rpc-statd.service	2022-08-02 11:02:44.327397404 -0400
+@@ -4,7 +4,8 @@ DefaultDependencies=no
+ Conflicts=umount.target
+ Requires=nss-lookup.target rpcbind.socket
+ Wants=network-online.target
+-After=network-online.target nss-lookup.target rpcbind.socket
++Wants=rpc-statd-notify.service
++After=network-online.target nss-lookup.target rpcbind.service
+ 
+ PartOf=nfs-utils.service
+ 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 452baa6..66786ba 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.3.3
-Release: 56%{?dist}
+Release: 57%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -101,6 +101,7 @@ Patch051: nfs-utils-2.3.3-rpcctl.patch
 Patch052: nfs-utils-2.3.3-nfsrahead.patch
 Patch053: nfs-utils-2.3.3-rpcctl-subparser.patch
 Patch054: nfs-utils-2.3.3-rpcctl-posixpath.patch
+Patch055: nfs-utils-2.3.3-systemd-rpcstatd.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -379,6 +380,9 @@ fi
 %{_libdir}/libnfsidmap.so
 
 %changelog
+* Tue Aug  2 2022 Steve Dickson <steved@redhat.com> 2.3.3-57
+- rpc-statd.service: Stop rpcbind and rpc.stat in an exit race (bz 2100395)
+
 * Thu Jun 30 2022 Steve Dickson <steved@redhat.com> 2.3.3-56
 - rpcctl: 'PosixPath' object has no attribute 'readlink' (bz 2087187)