diff --git a/keepassxc.spec b/keepassxc.spec
index dcd0a2b..2963ace 100644
--- a/keepassxc.spec
+++ b/keepassxc.spec
@@ -14,17 +14,20 @@ Source0:        https://github.com/keepassxreboot/keepassxc/releases/download/%{
 #
 # Patch0 improved by pewpeww https://src.fedoraproject.org/rpms/keepassxc/pull-request/1
 #
-# 23 March 2022 Germano Massullo's update: Jan Grulich said that Qt patch
-# https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dda7dab8274991e4a61a97c352d4367f8f815bb9
-# is included in qt5-qtbase in all Fedora versions since 32, even before it
-# landed upstream, but it is not in RHEL qt5-qtbase package.
+# 23 March 2022 Germano Massullo's update: Jan Grulich said that Qt patch https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dda7dab8274991e4a61a97c352d4367f8f815bb9
+# is included in qt5-qtbase in all Fedora versions since 32, even before it landed upstream, but it is not in RHEL qt5-qtbase package.
 # So I think it is no longer needed in Fedora
 # 
-# Concerning upstream Qt6 version, the patch was reverted and kept for Qt 6.3,
-# but concerning keepassxc it is not important since it uses Qt 5
-%if 0%{?el8}
+# Concerning upstream Qt6 version, the patch was reverted and kept for Qt 6.3, but concerning keepassxc it is not important since it uses Qt 5
+#
+# 29 April 2022 Germano Massullo's update: users in upstream bugreports
+# https://github.com/keepassxreboot/keepassxc/issues/7959
+# https://github.com/keepassxreboot/keepassxc/issues/5608
+# are reporting regression. I am resuming xcb.patch to all branches
+#
+
 Patch0:         xcb.patch
-%endif
+
 
 BuildRequires:  botan2-devel
 BuildRequires:  cmake >= 3.1
@@ -40,12 +43,7 @@ BuildRequires:  libusb1-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  libyubikey-devel
-# concerning minizip-compat, read https://github.com/keepassxreboot/keepassxc/issues/7874
-%if 0%{?el8}
-BuildRequires:  minizip-compat-devel
-%else
 BuildRequires:  minizip-devel
-%endif
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  qrencode-devel
 BuildRequires:  readline-devel
@@ -177,8 +175,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
-* Wed Apr 13 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-3
-- BuildRequires: minizip-compat-devel for EPEL8
+* Fri Apr 29 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-3
+- enabled Patch0:xcb.patch for all branches
 
 * Mon Apr 11 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-2
 - replaces BuildRequires: minizip-compat-devel with BuildRequires: minizip-devel
diff --git a/xcb.patch b/xcb.patch
index b0238ce..dcda854 100644
--- a/xcb.patch
+++ b/xcb.patch
@@ -1,6 +1,7 @@
---- keepassxc-2.6.6-orig/src/main.cpp	2021-06-14 18:11:55.987803422 -0400
-+++ keepassxc-2.6.6/src/main.cpp	2021-06-14 18:13:31.501595998 -0400
-@@ -44,8 +44,26 @@
+diff -urNr keepassxc-2.7.1-orig/src/main.cpp keepassxc-2.7.1/src/main.cpp
+--- keepassxc-2.7.1-orig/src/main.cpp	2022-04-06 05:12:34.000000000 +0200
++++ keepassxc-2.7.1/src/main.cpp	2022-04-29 17:56:33.017403491 +0200
+@@ -43,8 +43,25 @@
  #endif
  #endif
  
@@ -16,14 +17,13 @@
 +    }
 +}
 +#endif
++
 +
  int main(int argc, char** argv)
  {
-+
 +#ifdef Q_OS_LINUX
-+wayland_hacks();
++    wayland_hacks();
 +#endif
-+
      QT_REQUIRE_VERSION(argc, argv, QT_VERSION_STR)
  
  #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)