diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 12a631b33f2d20370f67f2e551d1639977c6670a..1224fd22c3d1a1425f51248a9f7ae0d1a61f9fff 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,4 +1,32 @@
-0.9.4 -  17 March, 2017
+0.9.6 - 31 May, 2017
++++++++++++++++++++++++++++++++
+
+Server
+~~~~~~
+
+- Minimal Filesystem BlobsBackend implementation, disabled by default.
+
+Client
+~~~~~~
+
+- Minimal Blobs manager implementation
+- Blobs API
+- Ability to generate recovery code.
+- Fix deprecated multibackend call (cryptography).
+
+Misc
+~~~~~~
+
+- Post benchmark results to elasticsearch
+- Build docker image and push it to registry every time the dockerfile used for
+  tests is changed
+- Fix flaky tests
+- Cleanup old documentation.
+- Added dependency on treq.
+- Improve cpu/memory profiling.
+
+
+0.9.5 -  17 March, 2017
 +++++++++++++++++++++++++++++++
 
 Server
diff --git a/docs/changelog-next.rst b/docs/changelog-next.rst
index 52540f8e54c2f3ace0905d5d0c5e921e3eae33d1..f7a90692a45f5be029467e33fcde353c6491b53b 100644
--- a/docs/changelog-next.rst
+++ b/docs/changelog-next.rst
@@ -1,4 +1,4 @@
-0.9.4 - 
+0.9.7 - 
 +++++++++++++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during