diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f8c52886..0ff010b3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,14 @@ OpenNMT-tf follows [semantic versioning 2.0.0](https://semver.org/). The API cov
 
 ### Fixes and improvements
 
+## [2.18.1](https://github.com/OpenNMT/OpenNMT-tf/releases/tag/v2.18.1) (2021-04-27)
+
+### Fixes and improvements
+
+* Fix vocabulary update for models with shared embeddings
+* Fix a compatibility issue with TensorFlow 2.5 for early users
+* When all training attempts fail in batch size autotuning, log the error message of the last attempt
+
 ## [2.18.0](https://github.com/OpenNMT/OpenNMT-tf/releases/tag/v2.18.0) (2021-04-19)
 
 ### New features
diff --git a/opennmt/version.py b/opennmt/version.py
index af6859cb6..68e4cb882 100644
--- a/opennmt/version.py
+++ b/opennmt/version.py
@@ -1,6 +1,6 @@
 """OpenNMT-tf version."""
 
-__version__ = "2.18.0"
+__version__ = "2.18.1"
 
 INCLUSIVE_MIN_TF_VERSION = "2.3.0"
 EXCLUSIVE_MAX_TF_VERSION = "2.5.0"