diff --git a/SOURCES/bz2055016-IPsrcaddr-dhcp-warning.patch b/SOURCES/bz2055016-IPsrcaddr-dhcp-warning.patch
new file mode 100644
index 0000000..34bad14
--- /dev/null
+++ b/SOURCES/bz2055016-IPsrcaddr-dhcp-warning.patch
@@ -0,0 +1,41 @@
+From 6d2ed7615614ede093f097189876d0f08553a43e Mon Sep 17 00:00:00 2001
+From: Reid Wahl <nrwahl@protonmail.com>
+Date: Mon, 14 Feb 2022 22:23:39 -0800
+Subject: [PATCH] IPsrcaddr: Add warning about DHCP
+
+If DHCP is enabled for the interface that serves OCF_RESKEY_ipaddress,
+then NetworkManager (and possibly dhclient in systems without NM;
+unsure) may later re-add a route that the IPsrcaddr resource replaced.
+This may cause the resource to fail or cause other unexpected behavior.
+
+So far this has been observed with a default route, albeit with an edge
+case of a configuration (OCF_RESKEY_ipaddress on a different subnet)
+that may not be totally valid. There are likely to be other situations
+as well where DHCP can cause conflicts with IPsrcaddr's manual updates
+via iproute. The safest option is to use only static configuration for
+the involved interface.
+
+Resolves: RHBZ#1654862
+
+Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
+---
+ heartbeat/IPsrcaddr | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr
+index ec868409f..fd7b6f68d 100755
+--- a/heartbeat/IPsrcaddr
++++ b/heartbeat/IPsrcaddr
+@@ -99,6 +99,12 @@ meta_data() {
+ <longdesc lang="en">
+ Resource script for IPsrcaddr. It manages the preferred source address
+ modification. 
++
++Note: DHCP should not be enabled for the interface serving the preferred
++source address. Enabling DHCP may result in unexpected behavior, such as
++the automatic addition of duplicate or conflicting routes. This may
++cause the IPsrcaddr resource to fail, or it may produce undesired
++behavior while the resource continues to run.
+ </longdesc>
+ <shortdesc lang="en">Manages the preferred source address for outgoing IP packets</shortdesc>
+ 
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 4c70fbb..7daab09 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -56,6 +56,7 @@ Patch3: 	bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
 Patch4: 	bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch
 Patch5: 	bz2029704-db2-crm_attribute-use-forever.patch
 Patch6: 	bz2029753-podman-remove-anonymous-volumes.patch
+Patch7: 	bz2055016-IPsrcaddr-dhcp-warning.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -186,6 +187,7 @@ exit 1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -515,6 +517,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Feb 16 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-6
+- IPsrcaddr: add warning about possible issues when used with DHCP
+
+  Resolves: rhbz#2055016
+
 * Wed Jan  5 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-5
 - podman: remove anonymous volumes
 
@@ -560,6 +567,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 - nfsserver: fix nfs-convert issue
 
   Resolves: rhbz#1997548, rhbz#1997576, rhbz#1991855
+
 * Mon Aug 16 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.8.0-11
 - Filesystem: force_unmount: remove "Default value" text from metadata