diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92890ba1..302fba83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+Sygnal 0.6.0 (2020-05-12)
+=========================
+
+Features
+--------
+
+- Report the APNS certificate expiry as a prometheus metric. ([\#106](https://github.com/matrix-org/sygnal/issues/106), [\#112](https://github.com/matrix-org/sygnal/issues/112))
+- Change APNS payload to be mutable and include the `event_id` in payload. ([\#114](https://github.com/matrix-org/sygnal/issues/114))
+
+
+Bugfixes
+--------
+
+- Sygnal will no longer warn about the `database` config field being not understood. ([\#100](https://github.com/matrix-org/sygnal/issues/100))
+- Log errors during start-up and fix the sample logging config. ([\#122](https://github.com/matrix-org/sygnal/issues/122))
+
+
+Improved Documentation
+----------------------
+
+- Document platform value for APNS apps ([\#110](https://github.com/matrix-org/sygnal/issues/110))
+
+
+Internal Changes
+----------------
+
+- Add Dockerfile. ([\#63](https://github.com/matrix-org/sygnal/issues/63))
+
+
 Sygnal 0.5.0 (2020-04-24)
 =========================
 
diff --git a/changelog.d/100.bugfix b/changelog.d/100.bugfix
deleted file mode 100644
index 384fbe85..00000000
--- a/changelog.d/100.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Sygnal will no longer warn about the 'database' config field being not understood.
\ No newline at end of file
diff --git a/changelog.d/106.feature b/changelog.d/106.feature
deleted file mode 100644
index c138ba64..00000000
--- a/changelog.d/106.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report the APNs certificate expiry as a prometheus metric.
diff --git a/changelog.d/110.doc b/changelog.d/110.doc
deleted file mode 100644
index f9cd62ec..00000000
--- a/changelog.d/110.doc
+++ /dev/null
@@ -1 +0,0 @@
-Document platform value for APNS apps
diff --git a/changelog.d/112.feature b/changelog.d/112.feature
deleted file mode 100644
index c138ba64..00000000
--- a/changelog.d/112.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report the APNs certificate expiry as a prometheus metric.
diff --git a/changelog.d/114.feature b/changelog.d/114.feature
deleted file mode 100644
index 3c2e01ae..00000000
--- a/changelog.d/114.feature
+++ /dev/null
@@ -1 +0,0 @@
-Change aps payload to be mutable, include event_id in payload.
diff --git a/changelog.d/122.bugfix b/changelog.d/122.bugfix
deleted file mode 100644
index 4bcf1673..00000000
--- a/changelog.d/122.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Log errors during start-up.
diff --git a/changelog.d/63.misc b/changelog.d/63.misc
deleted file mode 100644
index 9ea0228b..00000000
--- a/changelog.d/63.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add Dockerfile.