diff --git a/CMakeLists.txt b/CMakeLists.txt
index d70dd10ffc4..a47d5fc6257 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(Cppcheck VERSION 2.16.99 LANGUAGES CXX)
+project(Cppcheck VERSION 2.17.99 LANGUAGES CXX)
 
 include(cmake/options.cmake)
 
diff --git a/cli/main.cpp b/cli/main.cpp
index 4e6f61efae8..a829a4ef24c 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.16.99
+ * @version 2.17.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/lib/version.h b/lib/version.h
index 6370e90741f..47d11531e08 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -23,8 +23,8 @@
 #define versionH
 
 #define CPPCHECK_MAJOR_VERSION 2
-#define CPPCHECK_MINOR_VERSION 16
-#define CPPCHECK_DEVMINOR_VERSION 17
+#define CPPCHECK_MINOR_VERSION 17
+#define CPPCHECK_DEVMINOR_VERSION 18
 #define CPPCHECK_BUGFIX_VERSION 99
 
 #define STRINGIFY(x) STRING(x)
diff --git a/man/manual.md b/man/manual.md
index 695f9fba5de..4cf248c7b96 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.16.99
+subtitle: Version 2.17.99
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index fcf123049b0..5ced0b065a4 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.16.99
+subtitle: Version 2.17.99
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-addons.md b/man/writing-addons.md
index 070be0a48a3..ef097840227 100644
--- a/man/writing-addons.md
+++ b/man/writing-addons.md
@@ -1,6 +1,6 @@
 ---
 title: Writing addons
-subtitle: Version 2.16.99
+subtitle: Version 2.17.99
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py
index c041f38383e..f965f0afef2 100755
--- a/tools/donate-cpu-server.py
+++ b/tools/donate-cpu-server.py
@@ -26,10 +26,10 @@
 # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
 # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
 # changes)
-SERVER_VERSION = "1.3.63"
+SERVER_VERSION = "1.3.64"
 
 # TODO: fetch from GitHub tags
-OLD_VERSION = '2.16.0'
+OLD_VERSION = '2.17.0'
 
 HEAD_MARKER = 'head results:'
 INFO_MARKER = 'info messages:'
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index d5f519c2c98..f82ad89f144 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.17 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.18 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.16.99" ?>
+  <?define ProductVersion = "2.17.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>