diff --git a/CHANGELOG b/CHANGELOG
index ec711586..25988441 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+v 2.6.0
+  - add support for media content as a backup for missing content (useful for youtube feeds)
+  - correctly follow http error code 308 redirects
+  - fixed a bug that prevented users from deleting their account
+  - fixed a bug that made commafeed store entry contents multiple times
+  - fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed was not "/"
+  - fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+  - removed support for google+ and readability as those services no longer exist
+  - removed support for deploying on openshift
+  - removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+  - improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from users that did not log in for a long time
+  - various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+  - add support for mariadb
+  - add support for java17+ runtime
+  - various security improvements
 v 2.5.0
   - unread count is now displayed in a favicon badge when supported
   - the user agent string for the bot fetching feeds is now configurable
diff --git a/README.md b/README.md
index 2be1b50e..e79ddc2b 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Browser extensions: [Chrome](https://github.com/Athou/commafeed-chrome) - [Firef
 ### The very short version (download precompiled package)
 
     mkdir commafeed && cd commafeed
-    wget https://github.com/Athou/commafeed/releases/download/2.5.0/commafeed.jar
-    wget https://raw.githubusercontent.com/Athou/commafeed/2.5.0/config.yml.example -O config.yml
+    wget https://github.com/Athou/commafeed/releases/download/2.6.0/commafeed.jar
+    wget https://raw.githubusercontent.com/Athou/commafeed/2.6.0/config.yml.example -O config.yml
     vi config.yml
     java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
 
diff --git a/pom.xml b/pom.xml
index 276883b5..3aaf3292 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.6.0-SNAPSHOT</version>
+	<version>2.6.0</version>
 	<name>CommaFeed</name>
 
 	<properties>