diff --git a/CHANGELOG b/CHANGELOG
index 6e8494425fc1df1d6cad0032239544a0faadebfa..19cd704a1727133c2f660c10258a3649e74893c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,97 @@ Changelog
.. towncrier
+0.6 (2018-03-04)
+----------------
+
+Features:
+
+- Basic activity stream for listening and favorites (#23)
+- Switched to django-channels and daphne for serving HTTP and websocket (#34)
+
+Upgrades notes
+**************
+
+This version contains breaking changes in the way funkwhale is deployed,
+please read the notes carefully.
+
+Instance timeline
+^^^^^^^^^^^^^^^^^
+
+A new "Activity" page is now available from the sidebar, where you can
+browse your instance activity. At the moment, this includes other users
+favorites and listening, but more activity types will be implemented in the
+future.
+
+Internally, we implemented those events by following the Activity Stream
+specification, which will help us to be compatible with other networks
+in the long-term.
+
+A new settings page has been added to control the visibility of your activity.
+By default, your activity will be browsable by anyone on your instance,
+but you can switch to a full private mode where nothing is shared.
+
+The setting form is available in your profile.
+
+Switch from gunicorn to daphne
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This release include an important change in the way we serve the HTTP API.
+To prepare for new realtime features and enable websocket support in Funkwhale,
+we are now using django-channels and daphne to serve HTTP and websocket traffic.
+
+This replaces gunicorn and the switch should be easy assuming you
+follow the upgrade process described bellow.
+
+If you are using docker, please remove the command instruction inside the
+api service, as the up-to-date command is now included directly in the image
+as the default entry point:
+
+.. code-block:: yaml
+
+ api:
+ restart: unless-stopped
+ image: funkwhale/funkwhale:${FUNKWHALE_VERSION:-latest}
+ command: ./compose/django/gunicorn.sh # You can remove this line
+
+On non docker setups, you'll have to update the [Service] block of your
+funkwhale-server systemd unit file to launch the application server using daphne instead of gunicorn.
+
+The new configuration should be similar to this:
+
+.. code-block:: ini
+
+ [Service]
+ User=funkwhale
+ # adapt this depending on the path of your funkwhale installation
+ WorkingDirectory=/srv/funkwhale/api
+ EnvironmentFile=/srv/funkwhale/config/.env
+ ExecStart=/usr/local/bin/daphne -b ${FUNKWHALE_API_IP} -p ${FUNKWHALE_API_PORT} config.asgi:application
+
+Ensure you update funkwhale's dependencies as usual to install the required
+packages.
+
+On both docker and non-docker setup, you'll also have to update your nginx
+configuration for websocket support. Ensure you have the following blocks
+included in your virtualhost file:
+
+.. code-block:: txt
+
+ map $http_upgrade $connection_upgrade {
+ default upgrade;
+ '' close;
+ }
+
+ server {
+ ...
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+ }
+
+Remember to reload your nginx server after the edit.
+
+
0.5.4 (2018-02-28)
------------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index c1f45ffb6db4c5b33c2d560bb3a9ae8e4f987f40..c384dc52166ee78259adf5fc75c17eac242edb47 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
-__version__ = '0.5.4'
+__version__ = '0.6'
__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/23.feature b/changes/changelog.d/23.feature
deleted file mode 100644
index fbfac0d919543d2bd0bfa05ce4c66f1038bc6509..0000000000000000000000000000000000000000
--- a/changes/changelog.d/23.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Basic activity stream for listening and favorites (#23)
-
-A new "Activity" page is now available from the sidebar, where you can
-browse your instance activity. At the moment, this includes other users
-favorites and listening, but more activity types will be implemented in the
-future.
-
-Internally, we implemented those events by following the Activity Stream
-specification, which will help us to be compatible with other networks
-in the long-term.
-
-A new settings page has been added to control the visibility of your activity.
-By default, your activity will be browsable by anyone on your instance,
-but you can switch to a full private mode where nothing is shared.
-
-The setting form is available in your profile.
diff --git a/changes/changelog.d/34.feature b/changes/changelog.d/34.feature
deleted file mode 100644
index 1403f3dc149cc3e71abba871f6207ab765f3b2d0..0000000000000000000000000000000000000000
--- a/changes/changelog.d/34.feature
+++ /dev/null
@@ -1,59 +0,0 @@
-Switched to django-channels and daphne for serving HTTP and websocket (#34)
-
-Upgrade notes
-^^^^^^^^^^^^^
-
-This release include an important change in the way we serve the HTTP API.
-To prepare for new realtime features and enable websocket support in Funkwhale,
-we are now using django-channels and daphne to serve HTTP and websocket traffic.
-
-This replaces gunicorn and the switch should be easy assuming you
-follow the upgrade process described bellow.
-
-If you are using docker, please remove the command instruction inside the
-api service, as the up-to-date command is now included directly in the image
-as the default entry point:
-
-.. code-block:: yaml
-
- api:
- restart: unless-stopped
- image: funkwhale/funkwhale:${FUNKWHALE_VERSION:-latest}
- command: ./compose/django/gunicorn.sh # You can remove this line
-
-On non docker setups, you'll have to update the [Service] block of your
-funkwhale-server systemd unit file to launch the application server using daphne instead of gunicorn.
-
-The new configuration should be similar to this:
-
-.. code-block:: ini
-
- [Service]
- User=funkwhale
- # adapt this depending on the path of your funkwhale installation
- WorkingDirectory=/srv/funkwhale/api
- EnvironmentFile=/srv/funkwhale/config/.env
- ExecStart=/usr/local/bin/daphne -b ${FUNKWHALE_API_IP} -p ${FUNKWHALE_API_PORT} config.asgi:application
-
-Ensure you update funkwhale's dependencies as usual to install the required
-packages.
-
-On both docker and non-docker setup, you'll also have to update your nginx
-configuration for websocket support. Ensure you have the following blocks
-included in your virtualhost file:
-
-.. code-block:: txt
-
- map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
- }
-
- server {
- ...
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- }
-
-Remember to reload your nginx server after the edit.