diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b8a6d8d3..f3866b3c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 ArduinoJson: change log
 =======================
 
-HEAD
-----
+v6.18.0 (2021-05-05)
+-------
 
 * Added support for custom converters (issue #687)
 * Added support for `Printable` (issue #1444)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bd9024be..a42759e1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.0)
 
-project(ArduinoJson VERSION 6.17.3)
+project(ArduinoJson VERSION 6.18.0)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     include(CTest)
diff --git a/README.md b/README.md
index a3ee6283c..c30028435 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ---
 
-[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.17.3)](https://www.ardu-badge.com/ArduinoJson/6.17.3)
+[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.18.0)](https://www.ardu-badge.com/ArduinoJson/6.18.0)
 [![Continuous Integration](https://github.com/bblanchon/ArduinoJson/workflows/Continuous%20Integration/badge.svg?branch=6.x)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x)
 [![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
diff --git a/appveyor.yml b/appveyor.yml
index 8cde69b2b..957e10d3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 6.17.3.{build}
+version: 6.18.0.{build}
 environment:
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
diff --git a/library.json b/library.json
index 32bd58a2d..4d6d60eb5 100644
--- a/library.json
+++ b/library.json
@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "6.17.3",
+  "version": "6.18.0",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"
diff --git a/library.properties b/library.properties
index 40c92d387..c6b2d9052 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoJson
-version=6.17.3
+version=6.18.0
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=A simple and efficient JSON library for embedded C++.
diff --git a/src/ArduinoJson/version.hpp b/src/ArduinoJson/version.hpp
index 02adac23c..d8aaf77d1 100644
--- a/src/ArduinoJson/version.hpp
+++ b/src/ArduinoJson/version.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "6.17.3"
+#define ARDUINOJSON_VERSION "6.18.0"
 #define ARDUINOJSON_VERSION_MAJOR 6
-#define ARDUINOJSON_VERSION_MINOR 17
-#define ARDUINOJSON_VERSION_REVISION 3
+#define ARDUINOJSON_VERSION_MINOR 18
+#define ARDUINOJSON_VERSION_REVISION 0