diff --git a/changelog.d/+85568e80.feature.md b/changelog.d/+85568e80.feature.md
new file mode 100644
index 000000000..f9e5486eb
--- /dev/null
+++ b/changelog.d/+85568e80.feature.md
@@ -0,0 +1 @@
+Added support for Matrix 1.16's `state_after` feature, allowing clients which understand it to sync room state changes more reliably. Contributed by @ginger.
diff --git a/changelog.d/917.bugfix.md b/changelog.d/917.bugfix.md
new file mode 100644
index 000000000..82dbaec18
--- /dev/null
+++ b/changelog.d/917.bugfix.md
@@ -0,0 +1 @@
+Adjusted legacy sync logic to no longer use the `roomsynctoken_shortstatehash` database column. Once this change has been confirmed to be stable and reliable, a future update will remove it entirely, significantly decreasing database sizes. Contributed by @ginger.