diff --git a/CHANGELOG.md b/CHANGELOG.md
index 853cd35e4..50fccd97f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,21 @@ Types of changes:
 - *Security* in case of vulnerabilities. 
 
 
+## 3.6.0 - 2020-06-28
+
+### Added
+- auto refresh current note (#553)
+- add CTRL+/ as shortcut for preview toggle (#556)
+- API: add app version to capabilities (#545)
+
+### Changed
+- localize default notes folder (#557)
+
+### Fixed
+- debounce autotitle (#555)
+- maintenance (#548, #550, #554, #558)
+
+
 ## 3.5.1 - 2020-06-11
 
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ea561df72..12bc38c30 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
 	<description><![CDATA[
 The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.
 ]]></description>
-	<version>3.5.1</version>
+	<version>3.6.0</version>
 	<licence>agpl</licence>
 	<author>Kristof Hamann</author>
 	<author>Bernhard Posselt</author>