diff --git a/.gitignore b/.gitignore
index b784c5d..7536899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /pacemaker-da2fd79.tar.gz
 /pacemaker-dc6eb43.tar.gz
 /pacemaker-d3699a6.tar.gz
+/pacemaker-631339c.tar.gz
diff --git a/pacemaker.spec b/pacemaker.spec
index 75a4ef8..5ccf852 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.5
-%global specversion 1
+%global specversion 2
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit d3699a6216bdf59de6f416ed73bc1bc9ca727dc2
+%global commit 631339ca5aa334d69906a932abb2b6886ede7cd0
 
 ## 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.
@@ -117,9 +117,14 @@
 %define archive_version %(c=%{commit}; echo ${c:10})
 %define archive_github_url %{commit}#/%{name}-%{archive_version}.tar.gz
 %else
+%if "%{commit}" == "DIST"
+%define archive_version %{pcmkversion}
+%define archive_github_url %{archive_version}#/%{name}-%{pcmkversion}.tar.gz
+%else
 %define archive_version %(c=%{commit}; echo ${c:0:%{commit_abbrev}})
 %define archive_github_url %{archive_version}#/%{name}-%{archive_version}.tar.gz
 %endif
+%endif
 ### Always use a simple release number
 %define pcmk_release %{specversion}
 
@@ -958,6 +963,11 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Nov 23 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-2
+- Rebase on upstream 2.1.5-rc3 release
+- Resolves: rhbz1626546
+- Related: rhbz2122352
+
 * Tue Nov 22 2022 Chris Lumens <clumens@redhat.com> - 2.1.5-1
 - Rebase on upstream 2.1.5-rc2 release
 - Resolves: rhbz1822125
diff --git a/sources b/sources
index 08f0c13..70013c1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nagios-agents-metadata-105ab8a.tar.gz) = 3b8a57de69f53cee1e4c0355ccd23fda49c72d06a802c3d6dc33f0fd1823766356b44f9eb14fb00f47678e522e8679a638f3850857ed7e8123dfea525151d1d5
-SHA512 (pacemaker-d3699a6.tar.gz) = fafd49e6cb88b2619c1f50766c309549e5c6bbbb2ee37ab8b46bd536534e1658970c09e286775d65342612a27a7c8d73da5720c4d5df61ba024983e7de3cbc27
+SHA512 (pacemaker-631339c.tar.gz) = 54686d63886f64746b8f4ce5dca8aeca189a8d8f27d53808aebb1cc6515fbf06c3a0d3d1c7e30674b0e85b2e207f4cfc1f37a4f64c1a42192bc43aa3e4a41477