diff --git a/0001-Explicitly-include-limits-for-compatibility-with-gcc.patch b/0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
new file mode 100644
index 0000000..2b6d44f
--- /dev/null
+++ b/0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
@@ -0,0 +1,24 @@
+From 0476b1daa73159aec411c7f10da6f313294f0e38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Tue, 4 May 2021 19:21:46 +0200
+Subject: [PATCH] Explicitly include <limits> for compatibility with gcc-11
+
+---
+ src/TypeUtils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/TypeUtils.h b/src/TypeUtils.h
+index c072681..f0ab9c2 100644
+--- a/src/TypeUtils.h
++++ b/src/TypeUtils.h
+@@ -9,6 +9,7 @@
+ 
+ #include <stdlib.h>
+ #include <type_traits>
++#include <limits>
+ 
+ #include <QtGlobal>
+ 
+-- 
+2.31.1
+
diff --git a/_service b/_service
deleted file mode 100644
index 6eb4831..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-   <param name="version">1.9.2</param>
-   <param name="url">https://invent.kde.org/sdk/kdiff3</param>
-   <param name="revision">refs/tags/1.9.2</param>
-   <param name="scm">git</param>
-   <param name="filename">kdiff3</param>
-   <param name="exclude">windows_installer</param>
-  </service>
-  <service name="recompress" mode="disabled">
-   <param name="file">*.tar</param>
-   <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="disabled" />
-</services>
diff --git a/kdiff3-1.9.2.tar.xz b/kdiff3-1.9.2.tar.xz
index cf6c9bd..eac406e 100644
--- a/kdiff3-1.9.2.tar.xz
+++ b/kdiff3-1.9.2.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0178f199afdaa87d126dfe26398e533a74a6defaa265f6ef3aa3c4228a02ba82
-size 423132
+oid sha256:f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805
+size 1053404
diff --git a/kdiff3-1.9.2.tar.xz.sig b/kdiff3-1.9.2.tar.xz.sig
new file mode 100644
index 0000000..41d92f1
--- /dev/null
+++ b/kdiff3-1.9.2.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmCip8UACgkQ9EKzbWFL
+Brz8sw//TUw2Istgn3/gzTNQAZPM2ESnrPRGrSjxjkGt3k+Q4RUA90tGTgaUfKCo
+57ctuCBhnw9othrEptVj2cmVIobYDwnGeXjZtNbajT022nYXFBDDvKMaXgREGrVa
+pQiLN9IPifDdunctIJwtVSzlBC4Al6XgBfxB2jS6KRoaGT3/TVrqgRg10Rvnj03i
+acysMwqiVT4udbCP+0vSvbUpWtzcNsQM5F5dJVF9fSe6n9KqBGiLPc2srTVBCqqr
+YsDV0kRaszBdE0bB+Ig7m3NcK/B/O1KzyvwTbX/+ANSH390Htm96GPUfTHUiUFiQ
+Mcp6oHrY3dl9vnLcZZfxhnEvIJPIV/FaacXdN6EtHm9j44VFmlBWquvWli5NSwqG
+aBAkYPOsE6l2sHYioQBM+51juXk6CbfNz+3wo3L2rXC40LqtgqS2IDgRF3f8wsah
+cK489y7b7HkFVkJ2MEi8grmhRs1UEJhYtbaa/j4Ez6+zOqsO9KVJAPSc38COYjpy
+GrhPhtD/WTzuFtoJrw3wMYVX3hgJufZBKs/o4NjqMQRC4MaEiLE9+siFvyAVmXFG
+/R1yCVgeapb00nM3PGAvLFX5GDowR8R5JPrcPCPHrcXs+QsI6EEMk3817g+zbCbD
+QY5wcngfFon+oRMx5PrEQpryC8iFJ3WKgnWLoDgx//f8IuAbwH0=
+=rdtz
+-----END PGP SIGNATURE-----
diff --git a/kdiff3-lang.tar.xz b/kdiff3-lang.tar.xz
deleted file mode 100644
index 8e85058..0000000
--- a/kdiff3-lang.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62a836dd279250259ac9b2585cbf87a75d2f12ece3233ffa2e9307731c460ac1
-size 631460
diff --git a/kdiff3.changes b/kdiff3.changes
index 341c986..2d38f99 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 28 12:37:13 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add GCC 11 build fix:
+  * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
+- Drop the _service file. Upstream release doesn't contain
+  precompiled code anymore.
+
 -------------------------------------------------------------------
 Mon May 17 08:14:30 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
 
diff --git a/kdiff3.keyring b/kdiff3.keyring
new file mode 100644
index 0000000..db669ef
Binary files /dev/null and b/kdiff3.keyring differ
diff --git a/kdiff3.spec b/kdiff3.spec
index cf81af2..0cc1ce6 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -24,8 +24,11 @@ Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Version Control
 URL:            https://apps.kde.org/kdiff3
-Source0:        %{name}-%{version}.tar.xz
-Source1:        kdiff3-lang.tar.xz
+Source0:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
+Source1:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
+Source2:        kdiff3.keyring
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -57,7 +60,7 @@ KDiff3 is a program that:
 %lang_package
 
 %prep
-%autosetup -p1 -a1
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build