diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c82af80..f2f40691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,33 @@
- 1.3.2 (2020-05-13)
+ 1.4.0-rc1 (2020-05-29)
+=======================
+
+Features
+--------
+
+- Move matrix<->slack account links to a seperate table, and properly logout users. ([\#419](https://github.com/matrix-org/matrix-appservice-slack/issues/419))
+- Add bot profile information on startup. ([\#423](https://github.com/matrix-org/matrix-appservice-slack/issues/423))
+- Add /ready endpoint ([\#425](https://github.com/matrix-org/matrix-appservice-slack/issues/425))
+
+
+Bugfixes
+--------
+
+- Fix issue which breaks setting up puppeting ([\#418](https://github.com/matrix-org/matrix-appservice-slack/issues/418))
+- Fix issue where puppets could not be registered for the same team or mxid twice. ([\#420](https://github.com/matrix-org/matrix-appservice-slack/issues/420))
+- Fix bug where puppeted users couldn't edit their own messages ([\#424](https://github.com/matrix-org/matrix-appservice-slack/issues/424))
+- Fix bug where users could not become puppeted if they had already logged in via oauth ([\#426](https://github.com/matrix-org/matrix-appservice-slack/issues/426))
+
+
+Internal Changes
+----------------
+
+- Fix `provisioning.enabled` config flag to be recognised in the code, and add ability to disable puppeting from the config. ([\#411](https://github.com/matrix-org/matrix-appservice-slack/issues/411))
+- Load configuration schema using absolute path to make it possible to start the service from any directory. ([\#415](https://github.com/matrix-org/matrix-appservice-slack/issues/415))
+- Fix `team_sync` indentation in the sample config. ([\#416](https://github.com/matrix-org/matrix-appservice-slack/issues/416))
+- Drop leftover code for oauth with webhooks, as it's not been supported for a long time. ([\#422](https://github.com/matrix-org/matrix-appservice-slack/issues/422))
+
+
+1.3.2 (2020-05-13)
 ===================
 
 Internal Changes
diff --git a/changelog.d/411.misc b/changelog.d/411.misc
deleted file mode 100644
index fed4ed18..00000000
--- a/changelog.d/411.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `provisioning.enabled` config flag to be recognised in the code, and add ability to disable puppeting from the config.
\ No newline at end of file
diff --git a/changelog.d/415.misc b/changelog.d/415.misc
deleted file mode 100644
index 8b2d6e18..00000000
--- a/changelog.d/415.misc
+++ /dev/null
@@ -1 +0,0 @@
-Load configuration schema using absolute path to make it possible to start the service from any directory.
diff --git a/changelog.d/416.misc b/changelog.d/416.misc
deleted file mode 100644
index 5a8050ec..00000000
--- a/changelog.d/416.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `team_sync` indentation in the sample config.
diff --git a/changelog.d/418.bugfix b/changelog.d/418.bugfix
deleted file mode 100644
index 3e5c9f42..00000000
--- a/changelog.d/418.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue which breaks setting up puppeting
diff --git a/changelog.d/419.feature b/changelog.d/419.feature
deleted file mode 100644
index 14bb6461..00000000
--- a/changelog.d/419.feature
+++ /dev/null
@@ -1 +0,0 @@
-Move matrix<->slack account links to a seperate table, and properly logout users.
\ No newline at end of file
diff --git a/changelog.d/420.bugfix b/changelog.d/420.bugfix
deleted file mode 100644
index 4def691a..00000000
--- a/changelog.d/420.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where puppets could not be registered for the same team or mxid twice.
diff --git a/changelog.d/422.misc b/changelog.d/422.misc
deleted file mode 100644
index 885cf673..00000000
--- a/changelog.d/422.misc
+++ /dev/null
@@ -1 +0,0 @@
-Drop leftover code for oauth with webhooks, as it's not been supported for a long time.
\ No newline at end of file
diff --git a/changelog.d/423.feature b/changelog.d/423.feature
deleted file mode 100644
index d02a68f8..00000000
--- a/changelog.d/423.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add bot profile information on startup.
\ No newline at end of file
diff --git a/changelog.d/424.bugfix b/changelog.d/424.bugfix
deleted file mode 100644
index ad616d2f..00000000
--- a/changelog.d/424.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where puppeted users couldn't edit their own messages
\ No newline at end of file
diff --git a/changelog.d/425.feature b/changelog.d/425.feature
deleted file mode 100644
index 23031f74..00000000
--- a/changelog.d/425.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add /ready endpoint
\ No newline at end of file
diff --git a/changelog.d/426.bugfix b/changelog.d/426.bugfix
deleted file mode 100644
index 085d229c..00000000
--- a/changelog.d/426.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where users could not become puppeted if they had already logged in via oauth
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d6512f9..d96344a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.3.2",
+  "version": "1.4.0-rc1",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {