diff --git a/changelog.d/1875.bugfix b/changelog.d/1875.bugfix
new file mode 100644
index 000000000..6b2a4a4b4
--- /dev/null
+++ b/changelog.d/1875.bugfix
@@ -0,0 +1 @@
+Re-added silently dropped support for MSC4155 invite filtering. Contributed by @nex.
diff --git a/changelog.d/1875.feature b/changelog.d/1875.feature
new file mode 100644
index 000000000..8407f1d19
--- /dev/null
+++ b/changelog.d/1875.feature
@@ -0,0 +1 @@
+Added support for MSC4380 invite blocking, which has become part of the Matrix specification in v1.18. Contributed by @nex.