diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ed60b5eca96520e54eb454224d0c29ddb14a5262..24c2064187ac0aba3ea2196f828d6126b1d20ef7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,40 @@
+0.8.1 - 14 July, 2016
++++++++++++++++++++++
+
+Client
+======
+
+Features
+~~~~~~~~
+- Add recovery document format version for future migrations.
+- Use DeferredLock instead of its locking cousin.
+- Use DeferredSemaphore instead of its locking cousin.
+
+Bugfixes
+~~~~~~~~
+- `#8180 <https://leap.se/code/issues/8180>`_: Initialize OpenSSL context just once.
+- Remove document content conversion to unicode. Users of API are responsible
+  for only passing valid JSON to Soledad for storage.
+
+Misc
+~~~~
+- Add ability to get information about sync phases for profiling purposes.
+- Add script for setting up develop environment.
+- Refactor bootstrap to remove shared db lock.
+- Removed multiprocessing from encdecpool with some extra refactoring.
+- Remove user_id argument from Soledad init.
+
+Common
+======
+
+Features
+~~~~~~~~
+- Embed l2db, forking u1db.
+
+Misc
+~~~~
+- Toxify tests.
+
 0.8.0 - 18 Apr, 2016
 ++++++++++++++++++++
 
diff --git a/client/changes/next-changelog.rst b/client/changes/next-changelog.rst
index 7ddb3a5739ba54d46361d3321161748458f42b2f..6c1c2a4952c3118130333bac9d98e6e9c738edae 100644
--- a/client/changes/next-changelog.rst
+++ b/client/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.8.1 - ...
+0.8.2 - ...
 ++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -10,26 +10,15 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
 
 Features
 ~~~~~~~~
-- Add recovery document format version for future migrations.
-- Use DeferredLock instead of its locking cousin.
 - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
-- New feature without related issue number.
 
 Bugfixes
 ~~~~~~~~
 - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
-- Remove document content conversion to unicode. Users of API are responsible
-  for only passing valid JSON to Soledad for storage.
-- Bugfix without related issue number.
 
 Misc
 ~~~~
-- Add ability to get information about sync phases for profiling purposes.
-- Add script for setting up develop environment.
-- Refactor bootstrap to remove shared db lock.
 - `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
-- Some change without issue number.
-- Removed multiprocessing from encdecpool with some extra refactoring.
 
 Known Issues
 ~~~~~~~~~~~~
diff --git a/common/changes/next-changelog.rst b/common/changes/next-changelog.rst
index c09743845c7f13a999c48e88cc422ff99cea2c44..64162b7b4a4b2f4cff713701cc27b8d1628b231d 100644
--- a/common/changes/next-changelog.rst
+++ b/common/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.8.0 - ...
+0.8.2 - ...
 +++++++++++++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
diff --git a/server/changes/next-changelog.rst b/server/changes/next-changelog.rst
index bdc9f8931bd5a5c0f544a1a6582ae0969d3f7943..fc4cbc30353d5f4790ef5acb5e52a8925d74ede3 100644
--- a/server/changes/next-changelog.rst
+++ b/server/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.8.1 - ...
+0.8.2 - ...
 ++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during