diff --git a/CHANGELOG.md b/CHANGELOG.md
index 800e7c195..7a7e105b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### v2.6.0
+
+- Added: Ability to use OIDC token for CLI login (#2695)
+- Added: Documentation for OIDC callback URLs in setup tool
+- Added: Ability for users to change their family and given name and company info (#2870)
+- Added: Support for invite-only user sign up (#2867)
+- Added: Option to disable partial autocompletion of users (#2864)
+- Added: Georeplication support in Swift storage (#2874)
+- Fixed: Namespace links ending in slashes (#2871)
+- Fixed: Contact info setup in setup tool (#2866)
+- Fixed: Lazy loading of teams and robots (#2883)
+- Fixed: OIDC auth headers (#2695)
+
 ### v2.5.0
 
 - Added: Better TLS caching (#2860)