diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67b0566..2f7cea34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+ 1.6.1 (2020-11-06)
+===================
+
+Features
+--------
+
+- Allow docker to reuse cache when building the image by copying only npm related file before running `npm install` ([\#531](https://github.com/matrix-org/matrix-appservice-slack/issues/531))
+
+
+Bugfixes
+--------
+
+- Hide typing notifications from puppeted users on Matrix ([\#528](https://github.com/matrix-org/matrix-appservice-slack/issues/528))
+- Fix an issue where the bridge may send duplicate messages to Slack when encryption is enabled. ([\#539](https://github.com/matrix-org/matrix-appservice-slack/issues/539))
+
+
+Improved Documentation
+----------------------
+
+- Improve the installation docs and the sample config file ([\#389](https://github.com/matrix-org/matrix-appservice-slack/issues/389))
+
+
+Internal Changes
+----------------
+
+- Added missing encryption config to the schema and sample config. ([\#538](https://github.com/matrix-org/matrix-appservice-slack/issues/538))
+
+
 1.6.0 (2020-10-02)
 ===================
 
diff --git a/changelog.d/389.doc b/changelog.d/389.doc
deleted file mode 100644
index 765debc2..00000000
--- a/changelog.d/389.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the installation docs and the sample config file
diff --git a/changelog.d/528.bugfix b/changelog.d/528.bugfix
deleted file mode 100644
index 2a91421e..00000000
--- a/changelog.d/528.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Hide typing notifications from puppeted users on Matrix
diff --git a/changelog.d/531.feature b/changelog.d/531.feature
deleted file mode 100644
index 65c55281..00000000
--- a/changelog.d/531.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow docker to reuse cache when building the image by copying only npm related file before running `npm install`
diff --git a/changelog.d/538.misc b/changelog.d/538.misc
deleted file mode 100644
index 57d2ff5d..00000000
--- a/changelog.d/538.misc
+++ /dev/null
@@ -1 +0,0 @@
-Added missing encryption config to the schema and sample config.
diff --git a/changelog.d/539.bugfix b/changelog.d/539.bugfix
deleted file mode 100644
index f809b64e..00000000
--- a/changelog.d/539.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue where the bridge may send duplicate messages to Slack when encryption is enabled.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 325f8340..4a40e63b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e7e27cdc..34f3f982 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {