diff --git a/CHANGELOG b/CHANGELOG
index f2705739c095e2246ebb93d9c982998eb7a57138..6e8494425fc1df1d6cad0032239544a0faadebfa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,19 @@ Changelog
 
 .. towncrier
 
+0.5.4 (2018-02-28)
+------------------
+
+Features:
+
+- Now stop running radio when clearing queue (#98)
+
+Bugfixes:
+
+- Fixed queue skipping tracks (#91)
+- Now loop properly on queue when we only have one track (#95)
+
+
 0.5.3 (2018-02-27)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 03e434591bb102570ca35cf6602834153901412d..c1f45ffb6db4c5b33c2d560bb3a9ae8e4f987f40 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/91.bugfix b/changes/changelog.d/91.bugfix
deleted file mode 100644
index 4fde544cff2d24733da3d1f2bf1a4993b8e06249..0000000000000000000000000000000000000000
--- a/changes/changelog.d/91.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed queue skipping tracks (#91)
diff --git a/changes/changelog.d/95.bugfix b/changes/changelog.d/95.bugfix
deleted file mode 100644
index fea5c947a0a2d07cdbe45080ff80f68ae698435f..0000000000000000000000000000000000000000
--- a/changes/changelog.d/95.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Now loop properly on queue when we only have one track (#95)
diff --git a/changes/changelog.d/98.feature b/changes/changelog.d/98.feature
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000