diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2718f9f9..37ff5cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,26 @@
- 2.5.0 (2021-02-10)
+2.6.0-rc1 (2021-03-04)
+===================
+
+Features
+--------
+
+- Add the `BridgeInfoStateSyncer` helper component to sync MSC2346 format state events to rooms. ([\#312](https://github.com/matrix-org/matrix-appservice-bridge/issues/312))
+
+
+Bugfixes
+--------
+
+- Ensure that the Intent room state cache is invalidate when the room state changes. ([\#310](https://github.com/matrix-org/matrix-appservice-bridge/issues/310))
+- Use `type=m.login.application` when registering appservice users, to comply with the spec. ([\#315](https://github.com/matrix-org/matrix-appservice-bridge/issues/315))
+
+
+Internal Changes
+----------------
+
+- Upgrade matrix-appservice-node to 0.8.0 ([\#311](https://github.com/matrix-org/matrix-appservice-bridge/issues/311))
+
+
+2.5.0 (2021-02-10)
 ===================
 
 No significant changes.
diff --git a/changelog.d/310.bugfix b/changelog.d/310.bugfix
deleted file mode 100644
index 3ed355fb..00000000
--- a/changelog.d/310.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that the Intent room state cache is invalidate when the room state changes.
\ No newline at end of file
diff --git a/changelog.d/311.misc b/changelog.d/311.misc
deleted file mode 100644
index 8649a64e..00000000
--- a/changelog.d/311.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade matrix-appservice-node to 0.8.0
\ No newline at end of file
diff --git a/changelog.d/312.feature b/changelog.d/312.feature
deleted file mode 100644
index 745433a8..00000000
--- a/changelog.d/312.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the `BridgeInfoStateSyncer` helper component to sync MSC2346 format state events to rooms.
\ No newline at end of file
diff --git a/changelog.d/315.bugfix b/changelog.d/315.bugfix
deleted file mode 100644
index 8f6ff16a..00000000
--- a/changelog.d/315.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use `type=m.login.application` when registering appservice users, to comply with the spec.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 8d84b1d0..9a5e79a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.5.0",
+  "version": "2.6.0-rc1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5ae377e1..122ea021 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.5.0",
+  "version": "2.6.0-rc1",
   "description": "Bridging infrastructure for Matrix Application Services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",