diff --git a/pacemaker.spec b/pacemaker.spec
index a77226c..7963859 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -36,10 +36,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.
@@ -914,6 +914,21 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Jul 17 2024 Chris Lumens <clumens@redhat.com> - 2.1.8-2
+- Rebase on upstream 2.1.8-rc4 release
+- Add ability to immediately shutdown system with PCMK_panic_action=
+- Fix a memory leak in the attribute daemon
+- Add ability to list options and parameters as parseable metadata
+- crm_verify now reports invalid fence level indexes
+- Fix an error in node ID handling in `crm_node -i`
+- Fix regression in attrd_updater output
+- Resolves: RHEL-39057
+- Resolves: RHEL-40117
+- Resolves: RHEL-23401
+- Resolves: RHEL-2996
+- Resolves: RHEL-47249
+- Resolves: RHEL-45935
+
 * Wed May 22 2024 Chris Lumens <clumens@redhat.com> - 2.1.8-1
 - Rebase on upstream 2.1.8-rc1 release
 - Fix a typo in the help output of pacemaker-fenced
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