diff --git a/CHANGELOG b/CHANGELOG
index 56c9271799861cde25b88ea6e5fd2e29686ee1f3..7a4fde60987c5ad41c68bc25566e82c075901562 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,38 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.21.2 (2020-07-27)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/index.html
+
+Enhancements:
+
+- Added a new ?related=obj_id filter for artists, albums and tracks, based on tags
+- Can now filter subscribed content through API (#1116)
+- Support ordering=random for artists, albums, tracks and channels endpoints (#1145)
+- Use role=alert on forms/toast message to improve accessibility (#1134)
+
+
+Bugfixes:
+
+- Fix embedded player not working on channel serie/album (#1175)
+- Fixed broken mimetype detection during import (#1165)
+- Fixed crash when loading recent albums via Subsonic (#1158)
+- Fixed crash with null help text in admin (#1161)
+- Fixed invalid metadata when importing multi-artists tracks/albums (#1104)
+- Fixed player crash when using Funkwhale as a PWA (#1157)
+- Fixed wrong covert art displaying in some situations (#1138)
+- Make channel card updated times more humanly readable, add internationalization (#1089)
+
+Contributors to this release (development, documentation, reviews):
+
+- Agate
+- Bheesham Persaud
+- Ciarán Ainsworth
+
+
 0.21.1 (2020-06-11)
 -------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 9ad0c1d71cdc860a436df16ed55e4c59565bc5a2..0317f7328dca66e7bfd6e74ca778de3eddbd1066 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.21.1"
+__version__ = "0.21.2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1089.bugfix b/changes/changelog.d/1089.bugfix
deleted file mode 100644
index bc3b7743913356708da65fb0b08500f02c7b3002..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1089.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make channel card updated times more humanly readable, add internationalization (#1089)
\ No newline at end of file
diff --git a/changes/changelog.d/1104.bugfix b/changes/changelog.d/1104.bugfix
deleted file mode 100644
index 23e765a75552c781c5f2c7acc1006d5c5e2779b4..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1104.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed invalid metadata when importing multi-artists tracks/albums (#1104)
diff --git a/changes/changelog.d/1116.enhancement b/changes/changelog.d/1116.enhancement
deleted file mode 100644
index d8c4cfbad135525fb5d5492e3b90abd9e454207a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1116.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Can now filter subscribed content through API (#1116)
\ No newline at end of file
diff --git a/changes/changelog.d/1134.enhancement b/changes/changelog.d/1134.enhancement
deleted file mode 100644
index 3e04439a19f7967cdfc95319916757ec83ca52b1..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1134.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Use role=alert on forms/toast message to improve accessibility (#1134)
diff --git a/changes/changelog.d/1138.bugfix b/changes/changelog.d/1138.bugfix
deleted file mode 100644
index b65b0c08cd28c4450876b3513644ccded18a1e10..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1138.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed wrong covert art displaying in some situations (#1138)
diff --git a/changes/changelog.d/1145.enhancement b/changes/changelog.d/1145.enhancement
deleted file mode 100644
index eefc8d46de74912585d5ca8e2dd7b4768ee85f80..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1145.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Support ordering=random for artists, albums, tracks and channels endpoints (#1145)
diff --git a/changes/changelog.d/1157.bugfix b/changes/changelog.d/1157.bugfix
deleted file mode 100644
index 1de17c8f07a459c843e2415f33335381aac5554a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1157.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed player crash when using Funkwhale as a PWA (#1157)
diff --git a/changes/changelog.d/1158.bugfix b/changes/changelog.d/1158.bugfix
deleted file mode 100644
index ff7fdd40741e1d23ce840bd26f0133b75872bcd6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1158.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed crash when loading recent albums via Subsonic (#1158)
diff --git a/changes/changelog.d/1161.bugfix b/changes/changelog.d/1161.bugfix
deleted file mode 100644
index 2c602fb42ad129b82025cd380b81ad851c7e9d4b..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1161.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed crash with null help text in admin (#1161)
diff --git a/changes/changelog.d/1165.bugfix b/changes/changelog.d/1165.bugfix
deleted file mode 100644
index e1b1b10e2720bdbd8c3ac1c9be4644cdf2cafca2..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1165.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken mimetype detection during import (#1165)
diff --git a/changes/changelog.d/1175.bugfix b/changes/changelog.d/1175.bugfix
deleted file mode 100644
index 29283b2d34c1cab315dd96607388a44be0db23a0..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1175.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix embedded player not working on channel serie/album (#1175)
\ No newline at end of file
diff --git a/changes/changelog.d/api-related.enhancement b/changes/changelog.d/api-related.enhancement
deleted file mode 100644
index 82be1c0f0c7ded24d2d06eff0640dda4012a355f..0000000000000000000000000000000000000000
--- a/changes/changelog.d/api-related.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added a new ?related=obj_id filter for artists, albums and tracks, based on tags