diff --git a/0001-Fix-gcc11-build-errors.patch b/0001-Fix-gcc11-build-errors.patch
deleted file mode 100644
index c3e9b1d..0000000
--- a/0001-Fix-gcc11-build-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 19889ea3957b5c59369b3ba2a24273d5c316a531 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
-Date: Sat, 19 Dec 2020 20:47:55 +0100
-Subject: [PATCH] Fix gcc11 build errors
-
-- Include required header file <limits>
-- Fixes the following errors when compiling with GCC 11:
-  lib/programmemory.cpp:477:44: error: 'numeric_limits' is not a member
-  of 'std'
-  test/testsymboldatabase.cpp:5978:18: error: 'numeric_limits' is not a
-  member of 'std'
----
- lib/programmemory.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
-index 440dd22..5bc55f0 100644
---- a/lib/programmemory.cpp
-+++ b/lib/programmemory.cpp
-@@ -6,6 +6,7 @@
- #include "token.h"
- #include <algorithm>
- #include <cassert>
-+#include <limits>
- #include <cstdio>
- #include <limits>
- #include <memory>
--- 
-2.31.1
-
diff --git a/0002-Another-gcc11-fix-3179.patch b/0002-Another-gcc11-fix-3179.patch
deleted file mode 100644
index bd442c5..0000000
--- a/0002-Another-gcc11-fix-3179.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1203306c3e76212a73794c9744b974a1a22e0c23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
- <31284574+kloczek@users.noreply.github.com>
-Date: Mon, 22 Mar 2021 17:43:08 +0000
-Subject: [PATCH 1/2] Another gcc11 fix (#3179)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp: In member function ‘void SymbolDatabase::createSymbolDatabaseExprIds()’:
-/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:32: error: ‘numeric_limits’ is not a member of ‘std’
- 1443 |                 if (id == std::numeric_limits<nonneg int>::max()) {
-      |                                ^~~~~~~~~~~~~~
-/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:54: error: expected primary-expression before ‘int’
- 1443 |                 if (id == std::numeric_limits<nonneg int>::max()) {
-      |                                                      ^~~
-/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:47: error: expected ‘)’ before ‘int’
- 1443 |                 if (id == std::numeric_limits<nonneg int>::max()) {
-      |                    ~                          ^      ~~~
-      |                                               )
-
-This patch adds missing `include #include <limits>`
-
-Co-authored-by: Your Name <you@example.com>
----
- lib/symboldatabase.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
-index d597892..3604d51 100644
---- a/lib/symboldatabase.cpp
-+++ b/lib/symboldatabase.cpp
-@@ -35,6 +35,7 @@
- #include <cassert>
- #include <climits>
- #include <cstring>
-+#include <limits>
- #include <iomanip>
- #include <iostream>
- #include <unordered_map>
--- 
-2.31.1
-
diff --git a/cppcheck-2.4.1.tar.gz b/cppcheck-2.4.1.tar.gz
deleted file mode 100644
index 69ba28f..0000000
--- a/cppcheck-2.4.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11a9d9fe5305a105561655c45d2cd83cb30fbc87b41d0569de1b00a1a314867f
-size 3761646
diff --git a/cppcheck-2.5.tar.gz b/cppcheck-2.5.tar.gz
new file mode 100644
index 0000000..07a8910
--- /dev/null
+++ b/cppcheck-2.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc27154d799935c96903dcc46653c526c6f4148a6912b77d3a50cb35dabd82e1
+size 3792628
diff --git a/cppcheck.changes b/cppcheck.changes
index 3c75566..b3a6c62 100644
--- a/cppcheck.changes
+++ b/cppcheck.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jul 17 13:10:26 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.5:
+  * checked that all features in c++11, c++14, c++17 are supported
+  * c++20 support is improved but not complete yet
+  * improved library files, better knowledge about APIs
+  * improved checks to detect more bugs
+  * fixed checks to avoid unwanted warnings
+  * suspicious container/iterator assignment in condition
+  * rethrow without current handled exception
+- drop 0002-Another-gcc11-fix-3179.patch, 0001-Fix-gcc11-build-errors.patch: upstream
+
 -------------------------------------------------------------------
 Tue Jun  1 09:00:08 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/cppcheck.spec b/cppcheck.spec
index fca3c9d..6773548 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -17,16 +17,13 @@
 
 
 Name:           cppcheck
-Version:        2.4.1
+Version:        2.5
 Release:        0
 Summary:        A tool for static C/C++ code analysis
 License:        GPL-3.0-or-later
 URL:            https://github.com/danmar/cppcheck
 Source:         https://github.com/danmar/cppcheck/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         fix-i586.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-Fix-gcc11-build-errors.patch
-Patch2:         0002-Another-gcc11-fix-3179.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gcc-c++