diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature
new file mode 100644
index 0000000000..cf603fa0c6
--- /dev/null
+++ b/changelog.d/6028.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
diff --git a/changelog.d/6028.misc b/changelog.d/6028.misc
deleted file mode 100644
index 85e81003ac..0000000000
--- a/changelog.d/6028.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in account_treepid_delegates config.