diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c63e6ee..6260f55c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+2.6.1 (2023-01-16)
+==================
+
+Features
+--------
+
+- The message in the admin room when creating a webhook now also shows the name and links to the room. ([\#620](https://github.com/matrix-org/matrix-hookshot/issues/620))
+
+
+Bugfixes
+--------
+
+- Fixed generic webhook 'user is already in the room' error ([\#627](https://github.com/matrix-org/matrix-hookshot/issues/627))
+- Hookshot now handles `uk.half-shot.matrix-hookshot.generic.hook` state event updates ([\#628](https://github.com/matrix-org/matrix-hookshot/issues/628))
+
+
 2.6.0 (2023-01-13)
 ==================
 
diff --git a/changelog.d/620.feature b/changelog.d/620.feature
deleted file mode 100644
index 35a52d77..00000000
--- a/changelog.d/620.feature
+++ /dev/null
@@ -1 +0,0 @@
-The message in the admin room when creating a webhook now also shows the name and links to the room.
diff --git a/changelog.d/627.bugfix b/changelog.d/627.bugfix
deleted file mode 100644
index acfc8753..00000000
--- a/changelog.d/627.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed generic webhook 'user is already in the room' error
diff --git a/changelog.d/628.bugfix b/changelog.d/628.bugfix
deleted file mode 100644
index cf57d3d2..00000000
--- a/changelog.d/628.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Hookshot now handles `uk.half-shot.matrix-hookshot.generic.hook` state event updates
diff --git a/package.json b/package.json
index 5ee67a2e..baf023ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",