diff --git a/pacemaker.spec b/pacemaker.spec
index 3125447..110f61c 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -41,10 +41,10 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.1.8
-%global specversion 1
+%global specversion 2
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit 39ef082405a19b22554ffd6efaa75c39a586640f
+%global commit bf1a172d5f199332c461ac14a9c9ca518689c995
 
 ## Since git v2.11, the extent of abbreviation is autoscaled by default
 ## (used to be constant of 7), so we need to convey it for non-tags, too.
@@ -199,7 +199,7 @@
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
 Version:       %{pcmkversion}
-Release:       %{pcmk_release}%{?dist}.3
+Release:       %{pcmk_release}%{?dist}
 
 License:       GPL-2.0-or-later AND LGPL-2.1-or-later
 Url:           https://www.clusterlabs.org/
@@ -850,6 +850,10 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Thu Jul 18 2024 Chris Lumens <clumens@redhat.com> - 2.1.8-2
+- Rebase on upstream 2.1.8-rc4 release
+- Related: RHEL-38543
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.8-1.3
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index 8fa07b4..9868f00 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
-SHA512 (pacemaker-39ef08240.tar.gz) = 328c821a42123c7add35022668d01ebe634fbf26c3b854cae43bdbe82e2210d6e33735069fac997c8622c7968166922dc48afe46570bbdc8ed566e2b88be3758
+SHA512 (pacemaker-bf1a172d5.tar.gz) = 07bb331e0b8ee03411e4c19e4fa06d3daed198a9d7a14f4476c1d73787b8717149f97d872c1289194d57226b53b6ab2864a7e3fd183c551076022057b09efc2f