diff --git a/CHANGELOG b/CHANGELOG
index 8b6bb59b2..8b88600d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,11 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.1.0
 --------------------------------------------------------------------------------
-- merge changes up to 6.0.24
+- merge changes up to 6.0.26
 - add attribute groups and selective output of attributes
-- add support for WebAuthn
 - do not use md5 password hashing anymore, hashes will be updated automatically
   when passwords are reset
+- count failed runs of a task, disable it after 5 failures
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.26