diff --git a/CHANGELOG.md b/CHANGELOG.md
index a12eee78..c1f7217f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,15 @@ The project follows [semantic versioning 2.0.0](https://semver.org/). The API co
 
 ### Fixes and improvements
 
+## [v1.18.4](https://github.com/OpenNMT/Tokenizer/releases/tag/v1.18.4) (2020-05-22)
+
+### Fixes and improvements
+
+* Fix segmentation fault on `cli/tokenize` exit
+* Ignore empty tokens during detokenization
+* When writing to a file, avoid flushing the output stream on each line
+* Update `cli/CMakeLists.txt` to mark Boost.ProgramOptions as required
+
 ## [v1.18.3](https://github.com/OpenNMT/Tokenizer/releases/tag/v1.18.3) (2020-03-09)
 
 ### Fixes and improvements
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 15f94285..3c528a97 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -35,7 +35,7 @@ def _maybe_add_library_root(lib_name, header_only=False):
 
 setup(
     name="pyonmttok",
-    version="1.18.3",
+    version="1.18.4",
     license="MIT",
     description="OpenNMT tokenization library",
     author="OpenNMT",