diff --git a/.gitignore b/.gitignore
index cc712ed..145d29e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ SOURCES/ffi-1.13.1.gem
 SOURCES/json-2.3.0.gem
 SOURCES/mustermann-1.1.1.gem
 SOURCES/open4-1.3.4-1.gem
-SOURCES/pcs-0.10.8.202-ea961.tar.gz
+SOURCES/pcs-0.10.8.210-9862.tar.gz
 SOURCES/pcs-web-ui-0.1.6.tar.gz
 SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz
 SOURCES/pyagentx-0.4.pcs.2.tar.gz
diff --git a/.pcs.metadata b/.pcs.metadata
index 4646271..505c02b 100644
--- a/.pcs.metadata
+++ b/.pcs.metadata
@@ -9,7 +9,7 @@ cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem
 0230e8c5a37f1543982e5b04be503dd5f9004b47 SOURCES/json-2.3.0.gem
 50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem
 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem
-aa19762a0c66442e8889fd9e3ea051e9a629a36b SOURCES/pcs-0.10.8.202-ea961.tar.gz
+cd01811967b4fa99aec5aefe71f8a88fc0f8c0e5 SOURCES/pcs-0.10.8.210-9862.tar.gz
 0d5a8c5f3c2888e19de1f7180401bbfcfd423e24 SOURCES/pcs-web-ui-0.1.6.tar.gz
 3d401b7048e51cb097c3b55c77492e76dde1d443 SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz
 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
diff --git a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
index a794881..0dbd5a3 100644
--- a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
+++ b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
@@ -1,4 +1,4 @@
-From 0d8882eb046f6c788c22358d717f49d6e1824405 Mon Sep 17 00:00:00 2001
+From b7ea818c8926b35f6b4d5dfa4b7794d0ca4f6045 Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
 Subject: [PATCH] do not support cluster setup with udp(u) transport
@@ -10,7 +10,7 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport
  3 files changed, 6 insertions(+)
 
 diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
-index e2a3d1ca..e92d5a93 100644
+index f9b5014a..44ea8c71 100644
 --- a/pcs/pcs.8.in
 +++ b/pcs/pcs.8.in
 @@ -426,6 +426,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
@@ -23,7 +23,7 @@ index e2a3d1ca..e92d5a93 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index dd92f701..abb316d9 100644
+index 2b967e6b..fc454c5a 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
 @@ -863,6 +863,7 @@ Commands:
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index e76abf8..607c245 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.10.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
@@ -20,7 +20,7 @@ Summary: Pacemaker Configuration System
 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 
 # %%global version_or_commit %%{version}
-%global version_or_commit %{version}.202-ea961
+%global version_or_commit %{version}.210-9862
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
@@ -565,6 +565,10 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Tue Jul 20 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-4
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Resolves: rhbz#1759995 rhbz#1872378 rhbz#1935594
+
 * Thu Jul 08 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-3
 - Rebased to latest upstream sources (see CHANGELOG.md)
 - Gating changes