diff --git a/cppcheck-1.90.tar.bz2 b/cppcheck-1.90.tar.bz2
deleted file mode 100644
index b295018..0000000
--- a/cppcheck-1.90.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43758d56613596c29440e55ea96a5a13e36f81ca377a8939648b5242faf61883
-size 2025457
diff --git a/cppcheck-2.1.tar.bz2 b/cppcheck-2.1.tar.bz2
new file mode 100644
index 0000000..0ece738
--- /dev/null
+++ b/cppcheck-2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab26eeef039e5b58aac01efb8cb664f2cc16bf9879c61bc93cd00c95be89a5f7
+size 2480943
diff --git a/cppcheck.changes b/cppcheck.changes
index 381ac37..dcdf342 100644
--- a/cppcheck.changes
+++ b/cppcheck.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Jul 13 21:16:05 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- Update to version 2.1
+  * We have tweaked build scripts.
+  * When you use USE_Z3=yes, we will handle new versions of z3 better. If you
+    have an old z3 library and get compilation problems you will need to add
+	a z3_version.h in externals.
+  * The cmake scripts was updated.
+  * There was a couple of bug fixes.
+  New check:
+  * for "expression % 1" the result is always 0.
+- Run spec-cleaner
+  * Remove rpm groups
+- Enable Z3 build flag
+
 -------------------------------------------------------------------
 Thu Mar 12 12:54:24 UTC 2020 - Vladislav Savic <vladisav@gmx.com>
 
diff --git a/cppcheck.spec b/cppcheck.spec
index 9b3184b..6f65978 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -17,11 +17,10 @@
 
 
 Name:           cppcheck
-Version:        1.90
+Version:        2.1
 Release:        0
 Summary:        A tool for static C/C++ code analysis
 License:        GPL-3.0-or-later
-Group:          Development/Languages/C and C++
 URL:            http://cppcheck.sourceforge.net/
 Source:         https://downloads.sourceforge.net/cppcheck/cppcheck-%{version}.tar.bz2
 BuildRequires:  cmake
@@ -31,6 +30,7 @@ BuildRequires:  libqt5-linguist-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
 BuildRequires:  xsltproc
+BuildRequires:  z3-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
@@ -61,7 +61,6 @@ errors:
 
 %package gui
 Summary:        A tool for static C/C++ code analysis
-Group:          Development/Languages/C and C++
 Requires:       cppcheck
 
 %description gui
@@ -70,7 +69,7 @@ This is the gui for Cppcheck, a program to detect bugs that your C/C++ compiler
 doesn't see.
 
 %prep
-%setup -q
+%autosetup
 
 %build
 %cmake \
@@ -78,7 +77,8 @@ doesn't see.
   -DFILESDIR="%{_datadir}/%{name}" \
   -DBUILD_GUI=ON \
   -DBUILD_TESTS=ON \
-  -DHAVE_RULES=yes
+  -DHAVE_RULES=yes \
+  -DUSE_Z3=yes
 %cmake_build
 
 # does not work with CMake, directly call provided Makefile from source directory