diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cae40b7f..a11a99056 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 0.6.0 - unreleased
+## 0.6.0 - 2019-04-23
 
 ### Added
 - Share boards with circles
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - Update labels after change in the UI @jakobroehrl
 - Allow limiting the app to groups again
 - Various REST API enhancements and fixes
+- Fix some issues with comments/activites
 
 
 ## 0.5.2 - 2018-12-20
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 8bc031523..ff9f02705 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>0.6.0-beta1</version>
+    <version>0.6.0</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>