diff --git a/0001-Fix-build-with-GCC-11-include-limits.patch b/0001-Fix-build-with-GCC-11-include-limits.patch
index 95f2f85..3f81ae5 100644
--- a/0001-Fix-build-with-GCC-11-include-limits.patch
+++ b/0001-Fix-build-with-GCC-11-include-limits.patch
@@ -1,7 +1,7 @@
 From 924424120a2c468511256072e05d1ecc7c0c74a7 Mon Sep 17 00:00:00 2001
 From: Thiago Macieira <thiago.macieira@intel.com>
 Date: Mon, 18 Jan 2021 07:40:54 -0800
-Subject: [PATCH] Fix build with GCC 11: include <limits>
+Subject: [PATCH 1/2] Fix build with GCC 11: include <limits>
 
 Fixes: QTBUG-90395
 Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
diff --git a/0001-Include-limits-in-qbytearraymatcher.h.patch b/0001-Include-limits-in-qbytearraymatcher.h.patch
deleted file mode 100644
index 4054b32..0000000
--- a/0001-Include-limits-in-qbytearraymatcher.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c8acc8a047956dc79ee4f0bfbee32daa981d0fa Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Mon, 8 Feb 2021 10:29:27 +0100
-Subject: [PATCH] Include <limits> in qbytearraymatcher.h
-
----
- src/corelib/text/qbytearraymatcher.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
-index 0eedfc1d20..26754829f1 100644
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -40,6 +40,8 @@
- #ifndef QBYTEARRAYMATCHER_H
- #define QBYTEARRAYMATCHER_H
- 
-+#include <limits>
-+
- #include <QtCore/qbytearray.h>
- 
- QT_BEGIN_NAMESPACE
--- 
-2.25.1
-
diff --git a/0002-Build-fixes-for-GCC-11.patch b/0002-Build-fixes-for-GCC-11.patch
new file mode 100644
index 0000000..03277cb
--- /dev/null
+++ b/0002-Build-fixes-for-GCC-11.patch
@@ -0,0 +1,59 @@
+From 896bcb186161c38965bd002b28156a2aab4b4a76 Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <ville.voutilainen@qt.io>
+Date: Mon, 18 Jan 2021 09:58:17 +0200
+Subject: [PATCH 2/2] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
+---
+ src/corelib/text/qbytearraymatcher.h     | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h  | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- a/src/corelib/text/qbytearraymatcher.h
++++ b/src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+ 
+ #include <QtCore/qbytearray.h>
+ 
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+ 
+ 
+diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+ 
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)
+-- 
+2.25.1
+
diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes
index e1fad88..9b2cf3f 100644
--- a/libqt5-qtbase.changes
+++ b/libqt5-qtbase.changes
@@ -3,7 +3,7 @@ Mon Feb  8 09:16:47 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
 - Add patch to fix build with GCC 11 (boo#1181861, QTBUG-90395):
   * 0001-Fix-build-with-GCC-11-include-limits.patch
-  * 0001-Include-limits-in-qbytearraymatcher.h.patch
+  * 0002-Build-fixes-for-GCC-11.patch
 
 -------------------------------------------------------------------
 Tue Jan 19 07:46:43 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec
index 3203963..6ef3233 100644
--- a/libqt5-qtbase.spec
+++ b/libqt5-qtbase.spec
@@ -71,8 +71,7 @@ Patch1001:      0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
 # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
 Patch2001:      0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
 Patch2002:      0001-Fix-build-with-GCC-11-include-limits.patch
-# Theoretically for upstream, but upstream is dead
-Patch2003:      0001-Include-limits-in-qbytearraymatcher.h.patch
+Patch2003:      0002-Build-fixes-for-GCC-11.patch
 BuildRequires:  cups-devel
 BuildRequires:  double-conversion-devel
 BuildRequires:  gcc-c++