diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f1cd9e1397a6db6aed8366aa5e472030ba521f72
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,19 @@
+0.5.0 - 18 Apr, 2016
+++++++++++++++++++++
+
+Features
+~~~~~~~~
+- `#7485 <https://leap.se/code/issues/7485>`_: Move validation, usage and audited date to the active document.
+- `#7713 <https://leap.se/code/issues/7713>`_: Update soledad documents by adding versioning field.
+- `#7500 <https://leap.se/code/issues/7500>`_: Use fingerprints instead of key ids.
+- `#7712 <https://leap.se/code/issues/7712>`_: Document the soledad docs fields.
+- Make EncryptionKey aware of the active address.
+
+Bugfixes
+~~~~~~~~
+- `#7974 <https://leap.se/code/issues/7974>`_: Return KeyNotFound Failure if not valid key is given to put_raw_key.
+
+Misc
+~~~~
+- This version includes changes in the Soledad Documents and minor modifications to the API.
+- Changelog migrated to rst.
diff --git a/CHANGELOG b/HISTORY.rst
similarity index 100%
rename from CHANGELOG
rename to HISTORY.rst
diff --git a/changes/next-changelog.txt b/changes/next-changelog.txt
index 2dd34d4a3f78e0e77359b317c2af030267bf7e38..c59c85a68bbc61fd2982ecf6af4978db847fcf15 100644
--- a/changes/next-changelog.txt
+++ b/changes/next-changelog.txt
@@ -1,4 +1,4 @@
-0.5.0 - xxx
+0.5.1 - xxx
 +++++++++++++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -10,26 +10,16 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
 
 Features
 ~~~~~~~~
-- `#7485 <https://leap.se/code/issues/7485>`_: Move validation, usage and audited date to the active document.
-- `#7713 <https://leap.se/code/issues/7713>`_: Update soledad documents by adding versioning field.
-- `#7500 <https://leap.se/code/issues/7500>`_: Use fingerprints instead of key ids.
-- `#7712 <https://leap.se/code/issues/7712>`_: Document the soledad docs fields.
-- Make EncryptionKey aware of the active address.
-
 - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
 - New feature without related issue number.
 
 Bugfixes
 ~~~~~~~~
-- `#7974 <https://leap.se/code/issues/7974>`_: Return KeyNotFound Failure if not valid key is given to put_raw_key.
-
 - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
 - Bugfix without related issue number.
 
 Misc
 ~~~~
-- This version includes changes in the Soledad Documents and minor modifications to the API.
-
 - `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
 - Some change without issue number.