diff --git a/pacemaker.spec b/pacemaker.spec
index 16c0b10..5e36909 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -18,7 +18,7 @@
 
 ## Upstream commit (or git tag, such as "Pacemaker-" plus the
 ## {pcmkversion} macro for an official release) to use for this package
-%global commit Pacemaker-2.0.4-rc3
+%global commit Pacemaker-2.0.4
 ## 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.
 %global commit_abbrev 9
@@ -187,7 +187,7 @@ BuildRequires: asciidoc inkscape publican
 %endif
 
 # git-style patch application
-BuildRequires: git
+#BuildRequires: git
 
 Provides:      pcmk-cluster-manager = %{version}-%{release}
 Provides:      pcmk-cluster-manager%{?_isa} = %{version}-%{release}
@@ -347,9 +347,9 @@ monitor resources.
 
 %prep
 %setup -q -a 1 -n %{name}-%{commit}
-%global __scm git_am
-%__scm_setup_git
-%autopatch -p1
+#global __scm git_am
+#__scm_setup_git
+#autopatch -p1
 
 %build
 
@@ -713,6 +713,11 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Tue Jun 16 2020 Chris Lumens <clumens@redhat.com> - 2.0.4-1
+- Update for new upstream tarball: Pacemaker-2.0.4
+  for full details, see included ChangeLog file or
+  https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.4
+
 * Thu Jun 04 2020 Chris Lumens <clumens@redhat.com> - 2.0.4-0.1.rc3
 - Update for new upstream tarball for release candidate: Pacemaker-2.0.4-rc3,
   for full details, see included ChangeLog file or
diff --git a/sources b/sources
index f4ca5fc..f0f399b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
-SHA512 (pacemaker-2.0.4-rc3.tar.gz) = 84f8a735d6d81e4a05e775f67f5733a6e90d79395cad4a7c7ed8494a5f2610506aeec1e3aaed37660935144cf0b6833037936d3d801022b3f903b9e421cd1b8f
+SHA512 (pacemaker-2.0.4.tar.gz) = fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d