diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 85ee8ea..2c78048 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,19 @@ History
 Version 2.3.6
 ^^^^^^^^^^^^^
 
+- Fix minor unicode bugs in with_name and with_suffix. Many thanks to
+  ppentchev for reporting and for providing a fix.
+
+- Fix a few minor bugs.
+
+- Allow unicode file paths on systems that support it
+  (note: unicode file paths will not work on Windows
+  due a broken filesystem encoder on Windows on Python 2).
+
+- Remove travis and add github actions for regression testing.
+
+- Fix mypy warnings.
+
 Version 2.3.5
 ^^^^^^^^^^^^^
 
diff --git a/VERSION b/VERSION
index 866c8e2..e75da3e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.6a0
+2.3.6