diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index d3666fa70..3fd9524ad 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,4 +1,4 @@
-tracks_version='2.5.3'
+tracks_version='2.6.0'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
 info=`git log --pretty=format:"%ai" -1`
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 5d7881030..0b960583d 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,15 +1,29 @@
 See doc/upgrading.md for the upgrade documentation!
 
-## Version 2.6
+## Version 2.6.0
 
 ## New features
 
 * Ruby 3.0 is now supported.
+* Support obsidian links in notes.
 
 ## Removed features
 
 * No longer supporting EOL Ruby 2.5
 
+### Bug fixes
+
+* Fix Docker image functionality in certain cases.
+* Lots of dependencies have been upgraded.
+* Fixed some error messages in import.
+* Fixed import in the Docker image.
+
+## Updated translations
+
+* Finnish (by maintainer Jyri-Petteri ”ZeiP” Paloposki)
+* Turkish (thanks Burak Ekseli!)
+* Spanish (thanks Francisco Serrador!)
+
 ## Version 2.5.2
 
 ### New features