diff --git a/.gitignore b/.gitignore
index fe00c3b..40d15a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ cppcheck-1.44.tar.bz2
 /cppcheck-2.7.tar.gz
 /cppcheck-2.7.3.tar.gz
 /cppcheck-2.7.4.tar.gz
+/cppcheck-2.8.tar.gz
+/cppcheck-2.8.2.tar.gz
+/cppcheck-2.9.tar.gz
diff --git a/cppcheck.spec b/cppcheck.spec
index 0d42ff9..4d2495b 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -1,10 +1,8 @@
 %undefine __cmake_in_source_build
-# pandoc not available in epel9, yet.  Do not do html docs
-%global html_docs 0
 
 Name:           cppcheck
-Version:        2.7.4
-Release:        1%{?dist}.1
+Version:        2.9
+Release:        1%{?dist}
 Summary:        Tool for static C/C++ code analysis
 License:        GPLv3+
 URL:            http://cppcheck.wiki.sourceforge.net/
@@ -19,20 +17,18 @@ BuildRequires:  gcc-c++
 BuildRequires:  pcre-devel
 BuildRequires:  docbook-style-xsl
 BuildRequires:  libxslt
+BuildRequires:  pandoc
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  tinyxml2-devel >= 2.1.0
 BuildRequires:  zlib-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  z3-devel >= 4.7.1
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-linguist
-BuildRequires:  make
-%if 0%{?html_docs}
-BuildRequires:  pandoc
-%endif
+BuildRequires: make
+
 
 %description
 Cppcheck is a static analysis tool for C/C++ code. Unlike C/C++
@@ -70,14 +66,12 @@ qhelpgenerator-qt5 online-help.qhcp -o online-help.qhc
 %build
 # Manuals
 make DB2MAN=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl man
-%if 0%{?html_docs}
 pandoc man/manual.md -o man/manual.html -s --number-sections --toc
 pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number-sections --toc
-%endif
 
 # Binaries
 # Upstream doesn't support shared libraries (unversioned solib)
-%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=yes -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF -DENABLE_OSS_FUZZ=OFF
+%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF -DENABLE_OSS_FUZZ=OFF
 %cmake_build
 
 %install
@@ -101,11 +95,7 @@ cd %{_vpath_builddir}/bin
 ./testrunner -g -q
 
 %files
-%if 0%{?html_docs}
 %doc AUTHORS man/manual.html man/reference-cfg-format.html
-%else
-%doc AUTHORS
-%endif
 %license COPYING
 %{_datadir}/Cppcheck/
 %{_bindir}/cppcheck
@@ -122,8 +112,20 @@ cd %{_vpath_builddir}/bin
 %{_bindir}/cppcheck-htmlreport
 
 %changelog
-* Thu May 05 2022 Troy Dawson <tdawson@redhat.com> - 2.7.4-1.1
-- No pandoc in epel9.  Build without html docs
+* Sun Aug 28 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.9-1
+- Update to 2.9
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jul 16 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.8.2-1
+- Update to 2.8.2
+
+* Wed May 25 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.8-1
+- Update to 2.8
+
+* Thu May 19 2022 Jerry James <loganjerry@gmail.com> - 2.7.4-2
+- Rebuild for z3 4.8.17
 
 * Fri Mar 25 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.4-1
 - Update to 2.7.4
diff --git a/sources b/sources
index 622803d..0999ab9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cppcheck-2.7.4.tar.gz) = 599101c2c5ffe8073849ca97dd99839af9d241dc10e0638d339aa919c2df98d48e3fbb882120c864647de97ed3f77434a2748eec489bfcebbebacb020fc32611
+SHA512 (cppcheck-2.9.tar.gz) = 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f