diff --git a/CHANGELOG b/CHANGELOG
index 0dce48476d8989251246ae2b40af9e9f17741daf..3c05d3309ac2574f07825988a196c0abe07099b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,72 @@
+0.7.0 Jun 01 2015:
+Client:
+  o Do not depend on pysqlite2 (#2945).
+  o Reset syncer connection when getting HTTP error during sync (#5855).
+  o Wait for last post request to finish before starting a new one (#5975).
+  o Use TLS v1 in soledad client. Fixes partially #6437
+  o Retry on sqlcipher thread timeouts (#6625).
+  o Fix the order of insertion of documents when using workers for decrypting
+    incoming documents during a sync. Closes #6757.
+  o Add dependency on Twisted. Closes #6797.
+  o Fix the log message when a local secret is not found so it's less
+    confusing. Closes #6892.
+  o Always initialize the sync db to allow for both asynchronous encryption
+    and asynchronous decryption when syncing.
+  o Fallback to utf-8 if confidence on chardet guessing is too low.
+  o Refactor asynchronous encryption/decryption code to its own file.
+  o Fix logging and graceful failing when exceptions are raised during sync.
+  o Improve log messages when concurrently fetching documents from the server.
+  o Store all incoming documents in the sync db (#5895).
+  o Include the IV in the encrypted document MAC (#6400).
+  o Adapt soledad to the new events api on leap.common. Related to #6359.
+  o Add a pool of HTTP/HTTPS connections that is able to verify the server
+    certificate against a given CA certificate.
+  o Use twisted.enterprise.adbapi for access to the sync database.
+  o Use twisted.web.client for client sync.
+
+Common:
+  o Include couch design docs source files in source distribution and only
+    compile ddocs.py when building the package (#5896).
+  o Bail out if cdocs/ dir does not exist. Closes: #6671
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
+  o  Adapt soledad to the new events api on leap.common. Related to #6359.
+
+Server:
+  o Run daemon as user soledad (#6436).
+  o Avoid use of SSLv3 (#6437).
+  o Fix server initscript location (#6557).
+  o Add dependency on Twisted. Closes #6797.
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
+  o Fix server daemon uid and gid by passing them to twistd on the initscript.
+  o Use monthly token databases. Closes #6785.
+
+0.6.5 Apr 09 2015:
+Server:
+  o Remove unneeded parameters from CouchServerState initialization. Closes
+    #6833.
+
+0.6.4 Jan 23 2015:
+Common:
+  o Bail out if cdocs/ dir does not exist. Closes: #6671
+
+0.6.3 Dec 16 2014:
+Client:
+  o Fix deferred encryption/decryption parameters (#6500).
+
+0.6.2 Dec 11 2014:
+Client:
+  o Fix incorrect ssl context setup.
+
+0.6.1 Dec 08 2014:
+Client:
+  o Use TLS v1 in soledad client. Fixes partially #6437
+
+Server:
+  o Run daemon as user soledad (#6436).
+  o Avoid use of SSLv3 (#6437).
+
 0.6.0 Jul 18, 2014:
 Client:
   o Close all connections after syncing. Fixes #5518.
diff --git a/client/changes/bug_2945_do-not-depend-on-pysqlite2 b/client/changes/bug_2945_do-not-depend-on-pysqlite2
deleted file mode 100644
index cf009a23be9beed7b0300c3d23979c8ce56448c6..0000000000000000000000000000000000000000
--- a/client/changes/bug_2945_do-not-depend-on-pysqlite2
+++ /dev/null
@@ -1 +0,0 @@
-  o Do not depend on pysqlite2 (#2945).
diff --git a/client/changes/bug_5855_reset-connection-on-http-error-during-syn b/client/changes/bug_5855_reset-connection-on-http-error-during-syn
deleted file mode 100644
index e71a9a29046b86964cddb64df8970b49236b4895..0000000000000000000000000000000000000000
--- a/client/changes/bug_5855_reset-connection-on-http-error-during-syn
+++ /dev/null
@@ -1 +0,0 @@
-  o Reset syncer connection when getting HTTP error during sync (#5855).
diff --git a/client/changes/bug_5975_wait-for-last-request-on-sync b/client/changes/bug_5975_wait-for-last-request-on-sync
deleted file mode 100644
index 7a394580607c69c4e7d8a5e63f6875b21e9a61b6..0000000000000000000000000000000000000000
--- a/client/changes/bug_5975_wait-for-last-request-on-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Wait for last post request to finish before starting a new one (#5975).
diff --git a/client/changes/bug_6437_use_tls b/client/changes/bug_6437_use_tls
deleted file mode 100644
index 7138d9620940714cacf402f794bf87c64a1d306f..0000000000000000000000000000000000000000
--- a/client/changes/bug_6437_use_tls
+++ /dev/null
@@ -1 +0,0 @@
-  o Use TLS v1 in soledad client. Fixes partially #6437
diff --git a/client/changes/bug_6625_retry-on-sqlcipher-thread-timeout b/client/changes/bug_6625_retry-on-sqlcipher-thread-timeout
deleted file mode 100644
index 8b2ce0552b72dad3f29c78475f554b762facd04e..0000000000000000000000000000000000000000
--- a/client/changes/bug_6625_retry-on-sqlcipher-thread-timeout
+++ /dev/null
@@ -1 +0,0 @@
-  o Retry on sqlcipher thread timeouts (#6625).
diff --git a/client/changes/bug_6757_fix-order-of-insertion-when-syncing b/client/changes/bug_6757_fix-order-of-insertion-when-syncing
deleted file mode 100644
index c0470f5a11fbe609bff43b95bc9642e2df26dcb6..0000000000000000000000000000000000000000
--- a/client/changes/bug_6757_fix-order-of-insertion-when-syncing
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Fix the order of insertion of documents when using workers for decrypting
-    incoming documents during a sync. Closes #6757.
diff --git a/client/changes/bug_6797_add-dependency-on-twisted b/client/changes/bug_6797_add-dependency-on-twisted
deleted file mode 100644
index 962222b0a0c0811bbebf6429991cb44beb272841..0000000000000000000000000000000000000000
--- a/client/changes/bug_6797_add-dependency-on-twisted
+++ /dev/null
@@ -1 +0,0 @@
-  o Add dependency on Twisted. Closes #6797.
diff --git a/client/changes/bug_6892_fix-log-message-for-local-secret b/client/changes/bug_6892_fix-log-message-for-local-secret
deleted file mode 100644
index 39c1325773f521d52e6aac0d67ebdad6958bc365..0000000000000000000000000000000000000000
--- a/client/changes/bug_6892_fix-log-message-for-local-secret
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Fix the log message when a local secret is not found so it's less
-    confusing. Closes #6892.
diff --git a/client/changes/bug_always-initialize-the-sync-db b/client/changes/bug_always-initialize-the-sync-db
deleted file mode 100644
index 2b12989ad4e2adf7ae6f14f4168d789e00fd5ca0..0000000000000000000000000000000000000000
--- a/client/changes/bug_always-initialize-the-sync-db
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Always initialize the sync db to allow for both asynchronous encryption
-    and asynchronous decryption when syncing.
diff --git a/client/changes/bug_cutoff-chardet-guessing b/client/changes/bug_cutoff-chardet-guessing
deleted file mode 100644
index 9535a413c27f8ae847e6547a167e51d795c4eb10..0000000000000000000000000000000000000000
--- a/client/changes/bug_cutoff-chardet-guessing
+++ /dev/null
@@ -1 +0,0 @@
-- Fallback to utf-8 if confidence on chardet guessing is too low.
diff --git a/client/changes/bug_fix-async-decrypt b/client/changes/bug_fix-async-decrypt
deleted file mode 100644
index eb0ce7b565cba08034a5c61a7585e548e4436ee9..0000000000000000000000000000000000000000
--- a/client/changes/bug_fix-async-decrypt
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Refactor asynchronous encryption/decryption code to its own file.
-  o Fix logging and graceful failing when exceptions are raised during sync.
diff --git a/client/changes/bug_improve-log-when-fetching-documents b/client/changes/bug_improve-log-when-fetching-documents
deleted file mode 100644
index a67ce028607c3c86744ab29ce90a76bd6e7b0557..0000000000000000000000000000000000000000
--- a/client/changes/bug_improve-log-when-fetching-documents
+++ /dev/null
@@ -1 +0,0 @@
-  o Improve log messages when concurrently fetching documents from the server.
diff --git a/client/changes/feature_5895-store-all-incoming-documents-in-sync-db b/client/changes/feature_5895-store-all-incoming-documents-in-sync-db
deleted file mode 100644
index 71d5a91f03a9ed6f99d05fb474cca24bae898104..0000000000000000000000000000000000000000
--- a/client/changes/feature_5895-store-all-incoming-documents-in-sync-db
+++ /dev/null
@@ -1 +0,0 @@
-  o Store all incoming documents in the sync db (#5895).
diff --git a/client/changes/feature_6400_include-iv-in-document-mac b/client/changes/feature_6400_include-iv-in-document-mac
deleted file mode 100644
index d8c9c9ccd2fd21ca7de06026b8cf64e093f991c0..0000000000000000000000000000000000000000
--- a/client/changes/feature_6400_include-iv-in-document-mac
+++ /dev/null
@@ -1 +0,0 @@
-  o Include the IV in the encrypted document MAC (#6400).
diff --git a/client/changes/feature_adapt-to-new-events-on-common b/client/changes/feature_adapt-to-new-events-on-common
deleted file mode 100644
index cd55fa7d019c903f30bfd95df6c259ef351dcfea..0000000000000000000000000000000000000000
--- a/client/changes/feature_adapt-to-new-events-on-common
+++ /dev/null
@@ -1 +0,0 @@
-- Adapt soledad to the new events api on leap.common. Related to #6359.
diff --git a/client/changes/feature_add-pool-of-http-https-connections b/client/changes/feature_add-pool-of-http-https-connections
deleted file mode 100644
index 7ff2a4ee7ca4e4aac04b38f705d7ede667214b99..0000000000000000000000000000000000000000
--- a/client/changes/feature_add-pool-of-http-https-connections
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add a pool of HTTP/HTTPS connections that is able to verify the server
-    certificate against a given CA certificate.
diff --git a/client/changes/feature_use-twisted-adbapi-for-sync-db b/client/changes/feature_use-twisted-adbapi-for-sync-db
deleted file mode 100644
index 41e5e6e37d81c60aaaad32e0c30d032655fb5456..0000000000000000000000000000000000000000
--- a/client/changes/feature_use-twisted-adbapi-for-sync-db
+++ /dev/null
@@ -1 +0,0 @@
-  o Use twisted.enterprise.adbapi for access to the sync database.
diff --git a/client/changes/feature_use-twisted-web-for-client-sync b/client/changes/feature_use-twisted-web-for-client-sync
deleted file mode 100644
index b4d1d4a4e2fc56b2b03a864557c45fd3163c6045..0000000000000000000000000000000000000000
--- a/client/changes/feature_use-twisted-web-for-client-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Use twisted.web.client for client sync.
diff --git a/common/changes/bug_5896_include-ddocs-source-in-sdist b/common/changes/bug_5896_include-ddocs-source-in-sdist
deleted file mode 100644
index 94188f5e87ea91e1240b8471fa6c1bf6746db0fd..0000000000000000000000000000000000000000
--- a/common/changes/bug_5896_include-ddocs-source-in-sdist
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Include couch design docs source files in source distribution and only
-    compile ddocs.py when building the package (#5896).
diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
deleted file mode 100644
index e57e50e54ba01e6209239caf4bb2672bc1106192..0000000000000000000000000000000000000000
--- a/common/changes/bug_6671-bail-out-if-no-cdocs-dir
+++ /dev/null
@@ -1 +0,0 @@
-o Bail out if cdocs/ dir does not exist. Closes: #6671
diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717e4f8eaf53b523ab9019d41b0b941c046..0000000000000000000000000000000000000000
--- a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove unneeded parameters from CouchServerState initialization. Closes
-    #6833.
diff --git a/common/changes/feature_adapt-to-new-events-on-common b/common/changes/feature_adapt-to-new-events-on-common
deleted file mode 100644
index cd55fa7d019c903f30bfd95df6c259ef351dcfea..0000000000000000000000000000000000000000
--- a/common/changes/feature_adapt-to-new-events-on-common
+++ /dev/null
@@ -1 +0,0 @@
-- Adapt soledad to the new events api on leap.common. Related to #6359.
diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
deleted file mode 100644
index 886964f1fd54b54f41a543e724bba5bcfad1680c..0000000000000000000000000000000000000000
--- a/server/changes/bug_6436_run-daemon-as-user-soledad
+++ /dev/null
@@ -1 +0,0 @@
-  o Run daemon as user soledad (#6436).
diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
deleted file mode 100644
index 5d41fbb3e58d6b06c648bda0bcc3999fcf96286b..0000000000000000000000000000000000000000
--- a/server/changes/bug_6437_avoid-sslv3
+++ /dev/null
@@ -1 +0,0 @@
-  o Avoid use of SSLv3 (#6437).
diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
deleted file mode 100644
index 6032b30232b6f0907c7c37f7143166e793657212..0000000000000000000000000000000000000000
--- a/server/changes/bug_6557_fix-server-initscript-location
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix server initscript location (#6557).
diff --git a/server/changes/bug_6797_add-dependency-on-twisted b/server/changes/bug_6797_add-dependency-on-twisted
deleted file mode 100644
index 962222b0a0c0811bbebf6429991cb44beb272841..0000000000000000000000000000000000000000
--- a/server/changes/bug_6797_add-dependency-on-twisted
+++ /dev/null
@@ -1 +0,0 @@
-  o Add dependency on Twisted. Closes #6797.
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717e4f8eaf53b523ab9019d41b0b941c046..0000000000000000000000000000000000000000
--- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remove unneeded parameters from CouchServerState initialization. Closes
-    #6833.
diff --git a/server/changes/bug_fix-initscript-uid-and-gid b/server/changes/bug_fix-initscript-uid-and-gid
deleted file mode 100644
index d4767984b3ce38e03e30141ee9c7083abac36034..0000000000000000000000000000000000000000
--- a/server/changes/bug_fix-initscript-uid-and-gid
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix server daemon uid and gid by passing them to twistd on the initscript.
diff --git a/server/changes/feature_6785_use-monthly-token-db b/server/changes/feature_6785_use-monthly-token-db
deleted file mode 100644
index f7987cade84b7686bd0e6e9d4b9558e6f6435b2c..0000000000000000000000000000000000000000
--- a/server/changes/feature_6785_use-monthly-token-db
+++ /dev/null
@@ -1 +0,0 @@
-  o Use monthly token databases. Closes #6785.