diff --git a/CHANGELOG b/CHANGELOG
index 98a0d1b7ce23226f928826fff8fc237b76bafcbe..cd051c6a9d0cce4c99bc667c12555365464a042f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,37 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.2.1 (2022-01-06)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Fix Pipeline for stable release builds (#1652)
+- Fix remote content page (#1655)
+
+Contributors to our Issues:
+
+Ciarán Ainsworth
+Georg Krause
+Jakob Schürz
+Mathieu Jourdan
+Micha Gläß-Stöcker
+petitminion
+
+Contributors to our Merge Requests:
+
+Georg Krause
+
+Committers:
+Dignified Silence
+Georg Krause
+JuniorJPDJ
+nztvar
+
+
 1.2.0 (2021-12-27)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index a10021022c3691f833703c515d651ac14ace5e5e..42addee50175a95d844cdc72fcb66741403c3492 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1652.bugfix b/changes/changelog.d/1652.bugfix
deleted file mode 100644
index fa194ce38a9651312a31dd5faf55f0a58415b6a6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1652.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Pipeline for stable release builds (#1652)
diff --git a/changes/changelog.d/1655.bugfix b/changes/changelog.d/1655.bugfix
deleted file mode 100644
index f5607d3c54342516904d1357ec662e4a33eaa87a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1655.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix remote content page (#1655)