diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cbe34e2..5b5c1727 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
-## [Unreleased] - XXXX-XX-XX
+## [2.6.0] - 2020-10-16
+
+### Added
+
+- Files/folders in HTML emails are now clickable - [#893](https://github.com/owncloud/activity/issues/893)
--
## [2.5.4] - 2020-08-07
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3af0854b..78c9ef4b 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -14,8 +14,8 @@ And there you have it - a complete overview of all file and folder activities in
Never again miss an important event related to content in ownCloud and always be up-to-date on all activities of your files and folders.
AGPL
- Frank Karlitschek, Joas Schilling, Tom Needham, Thomas Müller, Vincent Petry
- 2.5.4
+ Thomas Müller, Frank Karlitschek, Joas Schilling, Tom Needham, Vincent Petry
+ 2.6.0