diff --git a/RHEL-109486-nfsserver-support-non-clustered-kerberized-mounts.patch b/RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
similarity index 100%
rename from RHEL-109486-nfsserver-support-non-clustered-kerberized-mounts.patch
rename to RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
diff --git a/RHEL-109486-2-nfsserver-fix-error-message.patch b/RHEL-109486-2-nfsserver-fix-error-message.patch
new file mode 100644
index 0000000..277c1a6
--- /dev/null
+++ b/RHEL-109486-2-nfsserver-fix-error-message.patch
@@ -0,0 +1,24 @@
+From 72620db5b52c943358faaf77ce5a15fb41169fab Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 31 Oct 2025 11:22:46 +0100
+Subject: [PATCH] nfsserver: set systemd_running before nfsserver_validate() to
+ avoid error message
+
+---
+ heartbeat/nfsserver | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
+index 83f4bac51..71a711305 100755
+--- a/heartbeat/nfsserver
++++ b/heartbeat/nfsserver
+@@ -1062,8 +1062,8 @@ nfsserver_validate ()
+ 	return $OCF_SUCCESS
+ }
+ 
+-nfsserver_validate
+ systemd_is_running; systemd_running=$?
++nfsserver_validate
+ 
+ case $__OCF_ACTION in
+ 	start)      nfsserver_start
diff --git a/resource-agents.spec b/resource-agents.spec
index 582c999..3665970 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.16.0
-Release:	36%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -96,7 +96,8 @@ Patch43:	RHEL-124206-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex
 Patch44:	RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch
 Patch45:	RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch
 Patch46:	RHEL-124881-oracle-improve-monpassword-description.patch
-Patch47:	RHEL-109486-nfsserver-support-non-clustered-kerberized-mounts.patch
+Patch47:	RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
+Patch48:	RHEL-109486-2-nfsserver-fix-error-message.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -315,6 +316,7 @@ exit 1
 %patch -p1 -P 45
 %patch -p1 -P 46
 %patch -p1 -P 47
+%patch -p1 -P 48
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -647,7 +649,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-36
+* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-37
 - nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs"
   in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts