diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc05b25..4a3d7a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [unreleased]
+## [0.6.0] - 2016-09-13
 
 ### Added
 * New style Diaspora Magic Envelope support. The magic envelope can be created using the class `federation.protocols.diaspora.magic_envelope.MagicEnvelope`. By default this will not wrap the payload message in `<XML><post></post></XML>`. To provide that functionality the class should be initialized with `wrap_payload=True`. No changes are made to the protocol send methods yet, if you need this new magic envelope you can initialize and render it directly.
diff --git a/federation/__init__.py b/federation/__init__.py
index 3d18726..906d362 100644
--- a/federation/__init__.py
+++ b/federation/__init__.py
@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.6.0"