diff --git a/CHANGELOG b/CHANGELOG
index 51b1f46ace61a84f794011ee31055c6355af1594..b6412acf9a6fd52577f46b221aafc2c168713040 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,81 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.21-rc2 (2020-04-22)
+---------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/index.html
+
+More reliable CLI importer [manual change suggested]
+----------------------------------------------------
+
+Our CLI importer is now more reliable and less prone to Out-of-Memory issues, especially when scanning large libraries. (hundreds of GB or bigger)
+
+We've also improved the directory crawling logic, so that you don't have to use glob patterns or specify extensions when importing.
+
+This means you can replace scripts that look like this::
+
+    python api/manage.py import_files $LIBRARY_ID "/srv/funkwhale/data/music/**/*.ogg" "/srv/funkwhale/data/music/**/*.mp3" --recursive --noinput
+
+By this::
+
+    python api/manage.py import_files $LIBRARY_ID "/srv/funkwhale/data/music/" --recursive --noinput
+
+And Funkwhale will happily import any supported audio file from the specified directory.
+
+Enhancements:
+
+- CLI Importer is now more reliable and less resource-hungry on large libraries
+- Add support custom domain for S3 storage
+- Better placeholders for channels when there are no episodes or series
+- Updated documentation for 0.21 release
+- Improved performance and error handling when fetching remote attachments
+
+Bugfixes:
+
+- Remove double spaces in ChannelForm
+- Deduplicate tags in Audio ActivityPub representation
+- Add support custom domain for S3 storage
+- Fix #1079: fixed z-index issues with dropdowns (#1079 and #1075)
+- Exclude external podcasts from library home
+- Fixed broken channel save when description is too long
+- Fixed 500 error when federation is disabled and application+json is requested
+- Fixed minor subsonic API crash
+- Fixed broken local profile page when allow-list is enabled
+- Fixed issue with confirmation email not sending when signup-approval was enabled
+- Ensure 0 quota on user is honored
+- Fixed attachments URL not honoring media URL
+- Fix grammar in msg string in TrackBase.vue
+- Fix typo in SubscribeButton.vue
+
+Translations:
+
+- Arabic
+- Catalan
+- English (United Kingdom)
+- German
+- Occitan
+- Portuguese (Brazil)
+- Russian
+
+
+Contributors to this release (translation, development, documentation, reviews, design, testing, third-party projects):
+
+- Agate
+- ButterflyOfFire
+- Ciarán Ainsworth
+- Creak
+- Daniele Lira Mereb
+- Eloisa
+- Francesc Galí
+- gerhardbeck
+- marzzzello
+- Quentin PAGÈS
+- Satsuki Yanagi
+- SpcCw
+- Xaloc
+
 0.21-rc1 (2020-04-09)
 ---------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index c46d17733df29062c5782fd60cee5b8846749485..a1295daf7cfe9e932666d4fea0fbc01e0beefb4a 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.21-rc1"
+__version__ = "0.21-rc2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/importer.enhancement b/changes/changelog.d/importer.enhancement
deleted file mode 100644
index f18d70117dbdbff9ac5d04b27fcf8addc1a7801d..0000000000000000000000000000000000000000
--- a/changes/changelog.d/importer.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-CLI Importer is now more reliable and less resource-hungry on large libraries
diff --git a/changes/changelog.d/s3-custom-domain.enhancement b/changes/changelog.d/s3-custom-domain.enhancement
deleted file mode 100644
index ba0ca787671ac1ac36830168fb92b3e14989b1d1..0000000000000000000000000000000000000000
--- a/changes/changelog.d/s3-custom-domain.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Add support custom domain for S3 storage
diff --git a/changes/notes.rst b/changes/notes.rst
index a1dbb5590d5c2e85a3a2eafb2aa1f90bdb3bae36..96ac3d7651f92166072a2fb200c0dd57606851e3 100644
--- a/changes/notes.rst
+++ b/changes/notes.rst
@@ -5,20 +5,3 @@ Next release notes
 
     Those release notes refer to the current development branch and are reset
     after each release.
-
-More reliable CLI importer
---------------------------
-
-Our CLI importer is now more reliable and less prone to Out-of-Memory issues, especially when scanning large libraries. (hundreds of GB or bigger)
-
-We've also improved the directory crawling logic, so that you don't have to use glob patterns or specify extensions when importing.
-
-This means you can replace scripts that look like this::
-
-    python api/manage.py import_files $LIBRARY_ID "/srv/funkwhale/data/music/**/*.ogg" "/srv/funkwhale/data/music/**/*.mp3" --recursive --noinput
-
-By this:
-
-    python api/manage.py import_files $LIBRARY_ID "/srv/funkwhale/data/music/" --recursive --noinput
-
-And Funkwhale will happily import any supported audio file from the specified directory.