diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000000000000000000000000000000000000..7222956710cd9f3b7eaec82a94459dd2b32d90c6
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,42 @@
+0.2.1 Jun 28:
+Client:
+  o Do not list the backends in the __init__'s __all__ to allow not
+    supporting couch on the client side until the code is diveded into
+    client and server.  o Fix bad dependencies in setup.py.
+  o Fix broken pip install
+  o Database request have default timeout too high, a
+    soledad.SOLEDAD_TIMEOUT variable has been added in order to have
+    more control over this. Fixes #2713
+  o Add validation and authorization of actions upon interaction with
+    server.
+  o Add MAC authentication to encrypted representation of documents.
+  o Add SQLCipher API to SQLCipher backend (allow for use of raw keys,
+    add better encrypted db assertion, add cipher, kdf_iter,
+    cipher_page_size and rekey PRAGMAS).
+  o Change symmetric encryption method to AES-256 CTR mode.
+  o Change the local storage of the storage secret:
+      * Use scrypt to derive a key for the encryption of the storage
+        secret.
+      * Store secret in a file called 'soledad.json' by default.
+      * Also store the salt and encryption details, as defined in the
+        spec.
+      * This change is not backwards compatible (i.e. all previously
+        stored secrets are incompatible with this new encryption and
+        storage scheme).
+  o Improve tests coverage.
+  o Split soledad client and server into two different packages.
+  o Use scrypt to derive the key for local encryption.
+
+Server:
+  o Add a `status` option to Soledad init script.
+  o Allow to initialize soledad with a blank server
+  o b64 encode all U1DB data in couch backend to avoid utf8 encoding
+    problems.
+    * init.d script improvements:
+    * Add LSB (Linux Standards Base) 3.1 compliant header
+    * Remove unnecessary backslashes in variable definitions
+    * Replace environment variables with more standard upper-cased names
+    * Make a TWISTD_PATH environment variable to replace hard-coded
+      /usr/local/bin/twistd
+    * Pull environment variables together into one block o Remove strict
+      dependency on leap.common.
diff --git a/changes/bug_all_backends b/changes/bug_all_backends
deleted file mode 100644
index bfb7253dd6f910be341cd6c260a439fb9f23cc62..0000000000000000000000000000000000000000
--- a/changes/bug_all_backends
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Do not list the backends in the __init__'s __all__ to allow not
-    supporting couch on the client side until the code is diveded into
-    client and server.
\ No newline at end of file
diff --git a/changes/bug_fix-deps b/changes/bug_fix-deps
deleted file mode 100644
index 415386f8d8664cec8f686b77f368970eb4e73f0a..0000000000000000000000000000000000000000
--- a/changes/bug_fix-deps
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix bad dependencies in setup.py.
diff --git a/changes/bug_fix-pip-install b/changes/bug_fix-pip-install
deleted file mode 100644
index fcb582952e7049493e081973b26762f9bf8c060f..0000000000000000000000000000000000000000
--- a/changes/bug_fix-pip-install
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix broken pip install
diff --git a/changes/bug_modifiable_timeout b/changes/bug_modifiable_timeout
deleted file mode 100644
index be690d5a2cb97e143db6ba6fb7aa2648d12b4cb9..0000000000000000000000000000000000000000
--- a/changes/bug_modifiable_timeout
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Database request have default timeout too high, a
-    soledad.SOLEDAD_TIMEOUT variable has been added in order to have
-    more control over this. Fixes #2713
\ No newline at end of file
diff --git a/changes/feature_add-action-validation b/changes/feature_add-action-validation
deleted file mode 100644
index 57d5b90ca2ce247773251731b8430c53ea0148e3..0000000000000000000000000000000000000000
--- a/changes/feature_add-action-validation
+++ /dev/null
@@ -1 +0,0 @@
-  o Add validation and authorization of actions upon interaction with server.
diff --git a/changes/feature_add-mac-authentication b/changes/feature_add-mac-authentication
deleted file mode 100644
index ce5a4789a047aaf0794cc8e101b18fe1b8c76324..0000000000000000000000000000000000000000
--- a/changes/feature_add-mac-authentication
+++ /dev/null
@@ -1 +0,0 @@
-  o Add MAC authentication to encrypted representation of documents.
diff --git a/changes/feature_add-sqlcipher-api b/changes/feature_add-sqlcipher-api
deleted file mode 100644
index 94c5aa57011b357106af66532aa74b0b8ae5c628..0000000000000000000000000000000000000000
--- a/changes/feature_add-sqlcipher-api
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Add SQLCipher API to SQLCipher backend (allow for use of raw keys, add
-    better encrypted db assertion, add cipher, kdf_iter, cipher_page_size and
-    rekey PRAGMAS).
diff --git a/changes/feature_add-status-to-initscript b/changes/feature_add-status-to-initscript
deleted file mode 100644
index ff264091002782535faab3585a949375d8600f37..0000000000000000000000000000000000000000
--- a/changes/feature_add-status-to-initscript
+++ /dev/null
@@ -1 +0,0 @@
-  o Add a `status` option to Soledad init script.
diff --git a/changes/feature_blank-server b/changes/feature_blank-server
deleted file mode 100644
index 6e68c992313d0375566a067328dace1ada50622a..0000000000000000000000000000000000000000
--- a/changes/feature_blank-server
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow to initialize soledad with a blank server
diff --git a/changes/feature_change-symmetric-encryption-method-to-aes-256-ctr b/changes/feature_change-symmetric-encryption-method-to-aes-256-ctr
deleted file mode 100644
index 8c44436a4a59de1558e679fb3dd52e2a690de721..0000000000000000000000000000000000000000
--- a/changes/feature_change-symmetric-encryption-method-to-aes-256-ctr
+++ /dev/null
@@ -1 +0,0 @@
-  o Change symmetric encryption method to AES-256 CTR mode.
diff --git a/changes/feature_encode-all-u1db-data-in-couch-backend b/changes/feature_encode-all-u1db-data-in-couch-backend
deleted file mode 100644
index 0366055776d64f5f47ddb9ea5fdd9d046024ca55..0000000000000000000000000000000000000000
--- a/changes/feature_encode-all-u1db-data-in-couch-backend
+++ /dev/null
@@ -1 +0,0 @@
-  o b64 encode all U1DB data in couch backend to avoid utf8 encoding problems.
diff --git a/changes/feature_encrypt-storage-key-with-kdf b/changes/feature_encrypt-storage-key-with-kdf
deleted file mode 100644
index f3ccf401c0960b86dab0bea3f806d0dae3adf342..0000000000000000000000000000000000000000
--- a/changes/feature_encrypt-storage-key-with-kdf
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Change the local storage of the storage secret:
-      * Use scrypt to derive a key for the encryption of the storage secret.
-      * Store secret in a file called 'soledad.json' by default.
-      * Also store the salt and encryption details, as defined in the spec.
-      * This change is not backwards compatible (i.e. all previously stored
-        secrets are incompatible with this new encryption and storage scheme).
diff --git a/changes/feature_improve-test-coverage b/changes/feature_improve-test-coverage
deleted file mode 100644
index 5491018586cf65d24439d1539b90a29cc39131b1..0000000000000000000000000000000000000000
--- a/changes/feature_improve-test-coverage
+++ /dev/null
@@ -1 +0,0 @@
-  o Improve tests coverage.
diff --git a/changes/feature_initscript-enhancements b/changes/feature_initscript-enhancements
deleted file mode 100644
index 24ff239e5bc5102f0fc2a67f90281a1fc2c4f354..0000000000000000000000000000000000000000
--- a/changes/feature_initscript-enhancements
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Add LSB (Linux Standards Base) 3.1 compliant header
-  o Remove unnecessary backslashes in variable definitions
-  o Replace environment variables with more standard upper-cased names
-  o Make a TWISTD_PATH environment variable to replace hard-coded /usr/local/bin/twistd
-  o Pull environment variables together into one block
\ No newline at end of file
diff --git a/changes/feature_remove-strict-dependency-on-leap.common b/changes/feature_remove-strict-dependency-on-leap.common
deleted file mode 100644
index f25dcbf30cdcfd718e570e2f61640036a84f48cb..0000000000000000000000000000000000000000
--- a/changes/feature_remove-strict-dependency-on-leap.common
+++ /dev/null
@@ -1 +0,0 @@
-  o Remove strict dependency on leap.common.
diff --git a/changes/feature_split-soledad-client-and-server b/changes/feature_split-soledad-client-and-server
deleted file mode 100644
index 0abab836fa5b6c7ec4fdcac4a4822d10f9a90d8d..0000000000000000000000000000000000000000
--- a/changes/feature_split-soledad-client-and-server
+++ /dev/null
@@ -1 +0,0 @@
-  o Split soledad client and server into two different packages.
diff --git a/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf b/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf
deleted file mode 100644
index 385c1c84e5efce1909372c056f30d34b35428002..0000000000000000000000000000000000000000
--- a/changes/feature_use-raw-sqlcipher-key-with-scrypt-as-kdf
+++ /dev/null
@@ -1 +0,0 @@
-  o Use scrypt to derive the key for local encryption.
diff --git a/soledad/setup.py b/soledad/setup.py
index f0d070da5870941e4fabd7b22f7c3c43a853dc3c..cda7f9f7c567e5ad010a3e6f77c4d6496d8e206e 100644
--- a/soledad/setup.py
+++ b/soledad/setup.py
@@ -62,7 +62,7 @@ trove_classifiers = (
 
 setup(
     name='leap.soledad',
-    version='0.1.1',
+    version='0.2.1',
     url='https://leap.se/',
     license='GPLv3+',
     description='Synchronization of locally encrypted data among devices.',
diff --git a/soledad_server/setup.py b/soledad_server/setup.py
index 522c86ff50b6dd95a8fbffa1843719cbec926b42..5e5fa058327ec55c88b0d4b70b0e2660e156faad 100644
--- a/soledad_server/setup.py
+++ b/soledad_server/setup.py
@@ -59,7 +59,7 @@ trove_classifiers = (
 
 setup(
     name='leap.soledad_server',
-    version='0.1.1',
+    version='0.2.1',
     url='https://leap.se/',
     license='GPLv3+',
     description='Synchronization of locally encrypted data among devices.',