diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f82616cbb..8c8f35234a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The following sections list the changes for unreleased.
 * Bugfix - Fix the kql-bleve search: [#7290](https://github.com/owncloud/ocis/pull/7290)
 * Bugfix - Check school number for duplicates before adding a school: [#7351](https://github.com/owncloud/ocis/pull/7351)
 * Bugfix - Do not reset state of received shares when rebuilding the jsoncs3 index: [#7319](https://github.com/owncloud/ocis/issues/7319)
+* Bugfix - Deprecate redundant encryptions settings for notification service: [#7345](https://github.com/owncloud/ocis/issues/7345)
 * Bugfix - Bring back the USERS_LDAP_USER_SCHEMA_ID variable: [#7312](https://github.com/owncloud/ocis/issues/7312)
 * Change - Change the default TUS chunk size: [#7273](https://github.com/owncloud/ocis/pull/7273)
 * Enhancement - Support spec violating AD FS access token issuer: [#7138](https://github.com/owncloud/ocis/pull/7138)
@@ -20,6 +21,7 @@ The following sections list the changes for unreleased.
 * Enhancement - Bump Reva: [#7138](https://github.com/owncloud/ocis/pull/7138)
 * Enhancement - Introduce clientlog service: [#7217](https://github.com/owncloud/ocis/pull/7217)
 * Enhancement - Add login URL config: [#7317](https://github.com/owncloud/ocis/pull/7317)
+* Enhancement - New value `auto` for NOTIFICATIONS_SMTP_AUTHENTICATION: [#7356](https://github.com/owncloud/ocis/issues/7356)
 * Enhancement - SSE for messaging: [#6992](https://github.com/owncloud/ocis/pull/6992)
 * Enhancement - Improve SSE format: [#7325](https://github.com/owncloud/ocis/pull/7325)
 * Enhancement - Keyword Query Language (KQL) search syntax: [#7212](https://github.com/owncloud/ocis/pull/7212)
@@ -68,6 +70,14 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis/issues/7319
 
+* Bugfix - Deprecate redundant encryptions settings for notification service: [#7345](https://github.com/owncloud/ocis/issues/7345)
+
+   The values `tls` and `ssl` for the `smtp_encryption` configuration setting are duplicates of
+   `starttls` and `ssltls`. They have been marked as deprecated. A warning will be logged when
+   they are still used. Please use `starttls` instead for `tls` and `ssltls` instead of `ssl.
+
+   https://github.com/owncloud/ocis/issues/7345
+
 * Bugfix - Bring back the USERS_LDAP_USER_SCHEMA_ID variable: [#7312](https://github.com/owncloud/ocis/issues/7312)
 
    We reintroduced the USERS_LDAP_USER_SCHEMA_ID variable which was accidently removed from
@@ -133,6 +143,14 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis/pull/7317
 
+* Enhancement - New value `auto` for NOTIFICATIONS_SMTP_AUTHENTICATION: [#7356](https://github.com/owncloud/ocis/issues/7356)
+
+   This cause the notifications service to automatically pick a suitable authentication method
+   to use with the configured SMTP server. This is also the new default behavior. The previous
+   default was to not use authentication at all.
+
+   https://github.com/owncloud/ocis/issues/7356
+
 * Enhancement - SSE for messaging: [#6992](https://github.com/owncloud/ocis/pull/6992)
 
    So far, sse has only been used to exchange messages between the server and the client. In order to