diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3981bcf36..26f39c699 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.6.0]
+
+- add a button to open CommaFeed in a new tab and a button to open options when using the browser extension
+- clicking on the entry title in expanded mode now opens the link instead of doing nothing
+- add tooltips to buttons when the mobile layout is used on desktop
+- redirect the user to the welcome page if the user was deleted from the database
+- add link to api documentation on welcome page
+- the unread count is now correctly updated when using the "/next" bookmarklet while redis cache is enabled
+
 ## [3.5.0]
 
 - add compatibility with the new version of the CommaFeed browser extension
diff --git a/commafeed-client/pom.xml b/commafeed-client/pom.xml
index dba0a93b8..046084f93 100644
--- a/commafeed-client/pom.xml
+++ b/commafeed-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>3.5.0</version>
+		<version>3.6.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml
index 93ab94542..b77acf58e 100644
--- a/commafeed-server/pom.xml
+++ b/commafeed-server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>3.5.0</version>
+		<version>3.6.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
@@ -226,7 +226,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 74257b4f5..33f174d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>3.5.0</version>
+	<version>3.6.0</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>