diff --git a/CHANGES.md b/CHANGES.md
index 0ddae2df4..2478b555a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,20 @@
 # Changes
 
+## 18.0.0
+
+This is what 17.0.2 should have been, as that contained two breaking changes. After updating
+Nise we are down to one breaking change, which only affects sinon-test (which has been updated),
+so most people are not affected. The legacyRoutes flag that is currently enabled in Nise by default
+will at some later version be disabled. We will then issue a little migration note.
+
+- [`01d45312`](https://github.com/sinonjs/sinon/commit/01d45312e82bbd0b2f435f16bd4a834b98d08e11)
+  Use Nise 6 with legacyRoutes flag enabled (Carl-Erik Kopseng)
+  > This should be disabled in a future Sinon version by default.
+- [`c618edc5`](https://github.com/sinonjs/sinon/commit/c618edc51e0302f047914e121cb788ac9cc43382)
+  fix #2594: remove needless sandbox creation (Carl-Erik Kopseng)
+
+_Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2024-05-15._
+
 ## 17.0.2
 
 - [`f6dca0ba`](https://github.com/sinonjs/sinon/commit/f6dca0bac3f228fa917165eca8815d5e2b8a6793)
diff --git a/docs/_config.yml b/docs/_config.yml
index 75ac37391..6e11a2cea 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -5,8 +5,8 @@ description: >-
 url: 'https://sinonjs.org'
 github_username: sinonjs
 sinon:
-  current_release: v17.0.2
-  current_major_version: 17
+  current_release: v18.0.0
+  current_major_version: 18
 markdown: kramdown
 kramdown:
   input: GFM
diff --git a/docs/changelog.md b/docs/changelog.md
index af8b3dcca..85f776d10 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -6,6 +6,21 @@ permalink: /releases/changelog
 
 # Changelog
 
+## 18.0.0
+
+This is what 17.0.2 should have been, as that contained two breaking changes. After updating
+Nise we are down to one breaking change, which only affects sinon-test (which has been updated),
+so most people are not affected. The legacyRoutes flag that is currently enabled in Nise by default
+will at some later version be disabled. We will then issue a little migration note.
+
+- [`01d45312`](https://github.com/sinonjs/sinon/commit/01d45312e82bbd0b2f435f16bd4a834b98d08e11)
+  Use Nise 6 with legacyRoutes flag enabled (Carl-Erik Kopseng)
+  > This should be disabled in a future Sinon version by default.
+- [`c618edc5`](https://github.com/sinonjs/sinon/commit/c618edc51e0302f047914e121cb788ac9cc43382)
+  fix #2594: remove needless sandbox creation (Carl-Erik Kopseng)
+
+_Released by [Carl-Erik Kopseng](https://github.com/fatso83) on 2024-05-15._
+
 ## 17.0.2
 
 - [`f6dca0ba`](https://github.com/sinonjs/sinon/commit/f6dca0bac3f228fa917165eca8815d5e2b8a6793)
diff --git a/package-lock.json b/package-lock.json
index 6c7c64707..61d707ab6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "sinon",
-  "version": "17.0.2",
+  "version": "18.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sinon",
-      "version": "17.0.2",
+      "version": "18.0.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^3.0.1",
diff --git a/package.json b/package.json
index ef6c33fd9..abe40320a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "xhr",
     "assert"
   ],
-  "version": "17.0.2",
+  "version": "18.0.0",
   "homepage": "https://sinonjs.org/",
   "author": "Christian Johansen",
   "repository": {