diff --git a/CHANGELOG b/CHANGELOG
index 19cd704a1..6881b7bf0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,27 @@ Changelog
 
 .. towncrier
 
+0.6.1 (unreleased)
+------------------
+
+Features:
+
+- Can now skip acoustid on file import with the --no-acoustid flag (#111)
+
+
+Bugfixes:
+
+- Added missing batch id in output during import (#112)
+- Added some feedback on the play button (#100)
+- Smarter pagination which takes a fixed size (#84)
+
+
+Other:
+
+- Completely removed django-cachalot from the codebase (#110). You can safely
+  remove the CACHALOT_ENABLED setting from your .env file
+
+
 0.6 (2018-03-04)
 ----------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index c384dc521..841f2a299 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.6'
+__version__ = '0.6.1'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/100.bugfix b/changes/changelog.d/100.bugfix
deleted file mode 100644
index cad193d52..000000000
--- a/changes/changelog.d/100.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added some feedback on the play button (#100)
diff --git a/changes/changelog.d/110.misc b/changes/changelog.d/110.misc
deleted file mode 100644
index 3b5163e92..000000000
--- a/changes/changelog.d/110.misc
+++ /dev/null
@@ -1 +0,0 @@
-Completely removed django-cachalot from the codebase (#110). You can safely remove the CACHALOT_ENABLED setting from your .env file
diff --git a/changes/changelog.d/111.feature b/changes/changelog.d/111.feature
deleted file mode 100644
index 73fc5df3a..000000000
--- a/changes/changelog.d/111.feature
+++ /dev/null
@@ -1 +0,0 @@
-Can now skip acoustid on file import with the --no-acoustid flag (#111)
diff --git a/changes/changelog.d/112.bugfix b/changes/changelog.d/112.bugfix
deleted file mode 100644
index ffd2f639c..000000000
--- a/changes/changelog.d/112.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added missing batch id in output during import (#112)
diff --git a/changes/changelog.d/84.bugfix b/changes/changelog.d/84.bugfix
deleted file mode 100644
index 2d7e08da0..000000000
--- a/changes/changelog.d/84.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Smarter pagination which takes a fixed size (#84)