diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f36703db..b5ebac0d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,14 @@
 Changelog
 =========
 
-0.2.36dev
----------
+
+0.2.36
+------
+
+Added
+^^^^^
+
+* ``panoptes-utils`` cli with sub-commands for converting CR2 to FITS and for plate-solving FITS.
 
 Changed
 ^^^^^^^
@@ -11,6 +17,11 @@ Changed
 * Updating ``pyscaffold`` to ``4.2.3``, which allows for ``pyproject.toml`` and ``tox`` usage.
 * Updating example SerialDevice notebook and fixing deps.
 
+Fixed
+^^^^^
+
+* Config server can now run on arbitrary ports better.
+
 Removed
 ^^^^^^^
 
@@ -24,6 +35,7 @@ Fixed
 ^^^^^
 
 * Fixes to support 420 namespaces and pyscaffold.
+* Don't deserialize all strings as dates unless they actually look like a date.
 
 
 0.2.34