diff --git a/.gitignore b/.gitignore
index 07d8dae..f84347e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/nagios-agents-metadata-105ab8a.tar.gz
-SOURCES/pacemaker-31aa4f5.tar.gz
+SOURCES/pacemaker-ba59be7.tar.gz
diff --git a/.pacemaker.metadata b/.pacemaker.metadata
index a932749..073d982 100644
--- a/.pacemaker.metadata
+++ b/.pacemaker.metadata
@@ -1,2 +1,2 @@
 ea6c0a27fd0ae8ce02f84a11f08a0d79377041c3 SOURCES/nagios-agents-metadata-105ab8a.tar.gz
-a1e8aa58fa9667d852676ff883c666729b51761f SOURCES/pacemaker-31aa4f5.tar.gz
+268769bcd0d6c2ea2d50db92aaea0f31637775d0 SOURCES/pacemaker-ba59be7.tar.gz
diff --git a/SOURCES/100-default-to-syncing-with-sbd.patch b/SOURCES/100-default-to-syncing-with-sbd.patch
new file mode 100644
index 0000000..2cde070
--- /dev/null
+++ b/SOURCES/100-default-to-syncing-with-sbd.patch
@@ -0,0 +1,36 @@
+From 34b2d8ab82dcdf49535c74e6a580240455498759 Mon Sep 17 00:00:00 2001
+From: Klaus Wenninger <klaus.wenninger@aon.at>
+Date: Wed, 2 Dec 2020 22:51:33 +0100
+Subject: [PATCH] default to syncing with sbd
+
+---
+ lib/common/watchdog.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/lib/common/watchdog.c b/lib/common/watchdog.c
+index 03ee7f1..bf5df18 100644
+--- a/lib/common/watchdog.c
++++ b/lib/common/watchdog.c
+@@ -244,12 +244,16 @@ pcmk__get_sbd_timeout(void)
+ bool
+ pcmk__get_sbd_sync_resource_startup(void)
+ {
+-    static bool sync_resource_startup = false;
++    static bool sync_resource_startup = true; // default overruled by env
+     static bool checked_sync_resource_startup = false;
+ 
+     if (!checked_sync_resource_startup) {
+-        sync_resource_startup =
+-            crm_is_true(getenv("SBD_SYNC_RESOURCE_STARTUP"));
++        gboolean ret = FALSE;
++        const char *s = getenv("SBD_SYNC_RESOURCE_STARTUP");
++
++        if ((s != NULL) && (crm_str_to_boolean(s, &ret) > 0)) {
++            sync_resource_startup = ret;
++        }
+         checked_sync_resource_startup = true;
+     }
+ 
+-- 
+1.8.3.1
+
diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec
index 56139d3..18ac7b4 100644
--- a/SPECS/pacemaker.spec
+++ b/SPECS/pacemaker.spec
@@ -23,10 +23,10 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 2.0.5
-%global specversion 2
+%global specversion 4
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit 31aa4f551559cea7c4341c5bf3907a4ca5ba3897
+%global commit ba59be71228fed04f78ab374dfac748d314d0e89
 ## 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 7
@@ -251,7 +251,7 @@ Source1:       nagios-agents-metadata-%{nagios_hash}.tar.gz
 #Patch1:         001-xxx.patch
 
 # downstream-only commits
-#Patch100:      xxx.patch
+Patch100:      100-default-to-syncing-with-sbd.patch
 
 Requires:      resource-agents
 Requires:      %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@@ -365,7 +365,10 @@ Group:         System Environment/Daemons
 Requires(pre): %{pkgname_shadow_utils}
 Requires:      %{name}-schemas = %{version}-%{release}
 # sbd 1.4.0+ supports the libpe_status API for pe_working_set_t
-Conflicts:     sbd < 1.4.0
+# sbd 1.4.2+ supports startup/shutdown handshake via pacemakerd-api
+#            and handshake defaults to enabled with rhel-builds
+#            applying 100-default-to-syncing-with-sbd.patch
+Conflicts:     sbd < 1.4.2
 
 %description -n %{pkgname_pcmk_libs}
 Pacemaker is an advanced, scalable High-Availability cluster resource
@@ -943,6 +946,16 @@ exit 0
 %license %{nagios_name}-%{nagios_hash}/COPYING
 
 %changelog
+* Wed Dec 2 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-4
+- Rebase on upstream 2.0.5 release
+- Make waiting to be pinged by sbd via pacemakerd-api the default
+- Resolves: rhbz1885645
+- Resolves: rhbz1873138
+
+* Wed Nov 18 2020 Ken Gaillot <kgaillot@redhat.com> - 2.0.5-3
+- Rebase on upstream 2.0.5-rc3 release
+- Resolves: rhbz1885645
+
 * Wed Oct 28 2020 Ken Gaillot <kgaillot@redhat.com> - 2.0.5-2
 - Rebase on upstream 2.0.5-rc2 release
 - Prevent ACL bypass (CVE-2020-25654)