diff --git a/0585-ganesha_ha-ganesha_grace-RA-fails-in-start-and-or-fa.patch b/0585-ganesha_ha-ganesha_grace-RA-fails-in-start-and-or-fa.patch
new file mode 100644
index 0000000..e3fa401
--- /dev/null
+++ b/0585-ganesha_ha-ganesha_grace-RA-fails-in-start-and-or-fa.patch
@@ -0,0 +1,77 @@
+From ba399a083a56963bb7414535ede6eff6afcd1a0a Mon Sep 17 00:00:00 2001
+From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
+Date: Mon, 14 Jun 2021 12:32:06 -0400
+Subject: [PATCH 585/585] ganesha_ha: ganesha_grace RA fails in start() and/or
+ fails in monitor () (#2523)
+
+shell [[ ]] string compare fails to match returned attr to the
+pattern and subsequently returns status of "not running", resulting
+in dependencies such as the IPaddr (cluster_ip) RA not starting
+
+Change-Id: I2c8d6f5c4cf0480672d52d8aa0d9226950441dc9
+commit 8ec66a43eedd505ec0b40f55c05f13a77fe8074e
+PR: https://github.com/gluster/glusterfs/pull/2523
+issue: https://github.com/gluster/glusterfs/issues/2522
+BUG: 1945143
+Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
+Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/247613
+Tested-by: RHGS Build Bot <nigelb@redhat.com>
+Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
+---
+ extras/ganesha/ocf/ganesha_grace | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/extras/ganesha/ocf/ganesha_grace b/extras/ganesha/ocf/ganesha_grace
+index edc6fa2..ca219af 100644
+--- a/extras/ganesha/ocf/ganesha_grace
++++ b/extras/ganesha/ocf/ganesha_grace
+@@ -122,15 +122,18 @@ ganesha_grace_start()
+ 
+ 	# case 1
+ 	if [[ -z "${attr}" ]]; then
++		ocf_log debug "grace start: returning success case 1"
+ 		return ${OCF_SUCCESS}
+ 	fi
+ 
+ 	# case 2
+-	if [[ "${attr}" = *"value=1" ]]; then
++	if [[ "${attr}" = *"host=\"${host}\" value=\"1\"" ]]; then
++		ocf_log debug "grace start: returning success case 2"
+ 		return ${OCF_SUCCESS}
+ 	fi
+ 
+ 	# case 3
++	ocf_log info "grace start returning: not running case 3 (${attr})"
+ 	return ${OCF_NOT_RUNNING}
+ }
+ 
+@@ -162,7 +165,7 @@ ganesha_grace_monitor()
+ {
+ 	local host=$(ocf_local_nodename)
+ 
+-	ocf_log debug "ganesha_grace monitor ${host}"
++	ocf_log debug "ganesha_grace_monitor ${host}"
+ 
+ 	attr=$(attrd_updater --query --node=${host} --name=${OCF_RESKEY_grace_active} 2> /dev/null)
+         if [ $? -ne 0 ]; then
+@@ -174,13 +177,16 @@ ganesha_grace_monitor()
+ 	# chance to create it. In which case we'll pretend
+ 	# everything is okay this time around
+ 	if [[ -z "${attr}" ]]; then
++		ocf_log debug "grace monitor: returning success case 1"
+ 		return ${OCF_SUCCESS}
+ 	fi
+ 
+-	if [[ "${attr}" = *"value=1" ]]; then
++	if [[ "${attr}" = *"host=\"${host}\" value=\"1\"" ]]; then
++		ocf_log debug "grace monitor: returning success case 2"
+ 		return ${OCF_SUCCESS}
+ 	fi
+ 
++	ocf_log info "grace monitor: returning not running case 3 (${attr})"
+ 	return ${OCF_NOT_RUNNING}
+ }
+ 
+-- 
+1.8.3.1
+
diff --git a/glusterfs.spec b/glusterfs.spec
index 3025970..a8575fa 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -237,7 +237,7 @@ Release:          0.2%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             glusterfs
 Version:          6.0
-Release:          57.4%{?dist}
+Release:          58%{?dist}
 ExcludeArch:      i686
 %endif
 License:          GPLv2 or LGPLv3+
@@ -901,6 +901,7 @@ Patch0581: 0581-afr-don-t-reopen-fds-on-which-POSIX-locks-are-held.patch
 Patch0582: 0582-protocol-client-Fix-lock-memory-leak.patch
 Patch0583: 0583-protocol-client-Initialize-list-head-to-prevent-NULL.patch
 Patch0584: 0584-dht-fixing-xattr-inconsistency.patch
+Patch0585: 0585-ganesha_ha-ganesha_grace-RA-fails-in-start-and-or-fa.patch
 
 %description
 GlusterFS is a distributed file-system capable of scaling to several
@@ -2647,6 +2648,7 @@ fi
 %endif
 
 %changelog
+<<<<<<< HEAD
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.0-57.4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
@@ -2660,6 +2662,9 @@ fi
 - Fix changlog chronological order by removing unneeded changelogs
 - fixes bug bz#1939340
 
+* Wed Jun 16 2021 Gluster Jenkins <dkhandel+glusterjenkins@redhat.com> - 6.0-58
+- fixes bugs bz#1945143
+
 * Tue Jun 08 2021 Gluster Jenkins <dkhandel+glusterjenkins@redhat.com> - 6.0-57
 - fixes bugs bz#1600379 bz#1689375 bz#1782428 bz#1798897 bz#1815462 
   bz#1889966 bz#1891403 bz#1901468 bz#1903911 bz#1908635 bz#1917488 bz#1918018