diff --git a/CHANGELOG.md b/CHANGELOG.md
index c498947..af2ed61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-# Changelog for [unreleased] (UNRELEASED)
+# Changelog for [0.6.0] (2020-08-17)
 
-The following sections list the changes for ocis-proxy unreleased.
+The following sections list the changes for ocis-proxy 0.6.0.
 
-[unreleased]: https://github.com/owncloud/ocis-proxy/compare/v0.5.0...master
+[0.6.0]: https://github.com/owncloud/ocis-proxy/compare/v0.5.0...v0.6.0
 
 ## Summary
 
@@ -280,7 +280,7 @@ The following sections list the changes for ocis-proxy 0.3.1.
 
 The following sections list the changes for ocis-proxy 0.3.0.
 
-[0.3.0]: https://github.com/owncloud/ocis-proxy/compare/v0.2.1...v0.3.0
+[0.3.0]: https://github.com/owncloud/ocis-proxy/compare/v0.2.0...v0.3.0
 
 ## Summary
 
@@ -314,27 +314,11 @@ The following sections list the changes for ocis-proxy 0.3.0.
 
    https://github.com/owncloud/ocis-proxy/issues/4
 
-# Changelog for [0.2.1] (2020-03-25)
-
-The following sections list the changes for ocis-proxy 0.2.1.
-
-[0.2.1]: https://github.com/owncloud/ocis-proxy/compare/v0.2.0...v0.2.1
-
-## Summary
-
-* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25)
-
-## Details
-
-* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25)
-
-   https://github.com/owncloud/ocis-proxy/pull/25
-
 # Changelog for [0.2.0] (2020-03-25)
 
 The following sections list the changes for ocis-proxy 0.2.0.
 
-[0.2.0]: https://github.com/owncloud/ocis-proxy/compare/v0.1.0...v0.2.0
+[0.2.0]: https://github.com/owncloud/ocis-proxy/compare/v0.2.1...v0.2.0
 
 ## Summary
 
@@ -365,6 +349,22 @@ The following sections list the changes for ocis-proxy 0.2.0.
 
    https://github.com/owncloud/ocis-proxy/pull/14
 
+# Changelog for [0.2.1] (2020-03-25)
+
+The following sections list the changes for ocis-proxy 0.2.1.
+
+[0.2.1]: https://github.com/owncloud/ocis-proxy/compare/v0.1.0...v0.2.1
+
+## Summary
+
+* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25)
+
+## Details
+
+* Bugfix - Set TLS-Certificate correctly: [#25](https://github.com/owncloud/ocis-proxy/pull/25)
+
+   https://github.com/owncloud/ocis-proxy/pull/25
+
 # Changelog for [0.1.0] (2020-03-18)
 
 The following sections list the changes for ocis-proxy 0.1.0.