diff --git a/CHANGELOG b/CHANGELOG
index 8c08fccff0eb6aa7d93959f31d08c444db330403..0f01b5825169c961c95a0b44ffd3787071ecec0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,11 +3,55 @@ Changelog
.. towncrier
-Release notes:
+0.8 (2018-04-02)
+----------------
+
+Features:
+
+- Add a detail page for radios (#64)
+- Implemented page title binding (#1)
+- Previous Track button restart playback after 3 seconds (#146)
+
+
+Enhancements:
+
+- Added credits to Francis Gading for the logotype (#101)
+- API endpoint for fetching instance activity and updated timeline to use this
+ new endpoint (#141)
+- Better error messages in case of missing environment variables (#140)
+- Implemented a @test@yourfunkwhaledomain bot to ensure federation works
+ properly. Send it "/ping" and it will answer back :)
+- Queue shuffle now apply only to tracks after the current one (#97)
+- Removed player from queue tab and consistently show current track in queue
+ (#131)
+- We now restrict some usernames from being used during signup (#139)
+
+
+Bugfixes:
+
+- Better error handling during file import (#120)
+- Better handling of utf-8 filenames during file import (#138)
+- Converted favicon from .ico to .png (#130)
+- Upgraded to Python 3.6 to fix weird but harmless weakref error on django task
+ (#121)
+
+
+Documentation:
+
+- Documented the upgrade process (#127)
+
Preparing for federation
^^^^^^^^^^^^^^^^^^^^^^^^
+Federation of music libraries is one of the most asked feature.
+While there is still a lot of work to do, this version includes
+the foundation that will enable funkwhale servers to communicate
+between each others, and with other federated software, such as
+Mastodon.
+
+Funkwhale will use ActivityPub as it's federation protocol.
+
In order to prepare for federation (see #136 and #137), new API endpoints
have been added under /federation and /.well-known/webfinger.
@@ -47,7 +91,10 @@ your instance requests on the federation. This can be done via::
source /srv/funkwhale/load_env
python manage.py generate_keys --no-input
-That's it :)
+To test and troobleshoot federation, we've added a bot account. This bot is available at @test@yourinstancedomain,
+and sending it "/ping", for example, via Mastodon, should trigger
+a response.
+
0.7 (2018-03-21)
diff --git a/changes/changelog.d/1.feature b/changes/changelog.d/1.feature
deleted file mode 100644
index 9b69cd5fe250fbb3f8d57baa796bbf6776880c6f..0000000000000000000000000000000000000000
--- a/changes/changelog.d/1.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implemented page title binding (#1)
diff --git a/changes/changelog.d/101.enhancement b/changes/changelog.d/101.enhancement
deleted file mode 100644
index e6d1fde9060a449781cbecad2526170c873ef6b3..0000000000000000000000000000000000000000
--- a/changes/changelog.d/101.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added credits to Francis Gading for the logotype (#101)
diff --git a/changes/changelog.d/120.bugfix b/changes/changelog.d/120.bugfix
deleted file mode 100644
index b7d9ef0662ff962d51ddecf81519b5a56cb3d380..0000000000000000000000000000000000000000
--- a/changes/changelog.d/120.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Better error handling during file import (#120)
diff --git a/changes/changelog.d/121.bugfix b/changes/changelog.d/121.bugfix
deleted file mode 100644
index 543f5b87b7cbb5bf9155935c266f8bec292c30eb..0000000000000000000000000000000000000000
--- a/changes/changelog.d/121.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Upgraded to Python 3.6 to fix weird but harmless weakref error on django task (#121)
diff --git a/changes/changelog.d/127.doc b/changes/changelog.d/127.doc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changes/changelog.d/130.bugfix b/changes/changelog.d/130.bugfix
deleted file mode 100644
index f8331ad67c782274aae718879aeab485f6b77034..0000000000000000000000000000000000000000
--- a/changes/changelog.d/130.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Converted favicon from .ico to .png (#130)
diff --git a/changes/changelog.d/131.enhancement b/changes/changelog.d/131.enhancement
deleted file mode 100644
index 260a8bb6fe7c71319567df75c9d6db4b95ae7cf6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/131.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Removed player from queue tab and consistently show current track in queue (#131)
diff --git a/changes/changelog.d/138.bugfix b/changes/changelog.d/138.bugfix
deleted file mode 100644
index 2a8f7aeb0d886fc8150d3504f612d6b2cfa05147..0000000000000000000000000000000000000000
--- a/changes/changelog.d/138.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Better handling of utf-8 filenames during file import (#138)
diff --git a/changes/changelog.d/139.enhancement b/changes/changelog.d/139.enhancement
deleted file mode 100644
index c6648d139d9cfac92e9a35557493fcc406ff1d54..0000000000000000000000000000000000000000
--- a/changes/changelog.d/139.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-We now restrict some usernames from being used during signup (#139)
diff --git a/changes/changelog.d/140.enhancement b/changes/changelog.d/140.enhancement
deleted file mode 100644
index 9bc3aab950fd018dbb5a87fe3442e678ff01bce6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/140.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Better error messages in case of missing environment variables (#140)
diff --git a/changes/changelog.d/141.enhancement b/changes/changelog.d/141.enhancement
deleted file mode 100644
index 5bccbfee5d45d5b4ffa772fb94023274ac07e826..0000000000000000000000000000000000000000
--- a/changes/changelog.d/141.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-API endpoint for fetching instance activity and updated timeline to use this new
-endpoint (#141)
diff --git a/changes/changelog.d/146.feature b/changes/changelog.d/146.feature
deleted file mode 100644
index 2a7617644fcc2d2ba25b86ea2cca0b9fe81657ed..0000000000000000000000000000000000000000
--- a/changes/changelog.d/146.feature
+++ /dev/null
@@ -1 +0,0 @@
-Previous Track button restart playback after 3 seconds (#146)
diff --git a/changes/changelog.d/64.feature b/changes/changelog.d/64.feature
deleted file mode 100644
index 87fe7052232c5e85ff9961e90710458f082a0fad..0000000000000000000000000000000000000000
--- a/changes/changelog.d/64.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a detail page for radios (#64)
\ No newline at end of file
diff --git a/changes/changelog.d/97.enhancement b/changes/changelog.d/97.enhancement
deleted file mode 100644
index 21a552ae25d6c476c690b1874af07ebb8acf59b9..0000000000000000000000000000000000000000
--- a/changes/changelog.d/97.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Queue shuffle now apply only to tracks after the current one (#97)
diff --git a/changes/changelog.d/test-bot.enhancement b/changes/changelog.d/test-bot.enhancement
deleted file mode 100644
index 03100d7c8963acc9d9acf8d3035b64bda1bf1296..0000000000000000000000000000000000000000
--- a/changes/changelog.d/test-bot.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Implemented a @test@yourfunkwhaledomain bot to ensure federation works properly. Send it "/ping" and it will answer back :)
diff --git a/pyproject.toml b/pyproject.toml
index baea16861cd0cb3b81afa8c6561921148f8b1d68..421f98c0261cb940ed3e5f5ce0e094977ee52aff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,6 +17,11 @@
name = "Features"
showcontent = true
+ [[tool.towncrier.type]]
+ directory = "enhancement"
+ name = "Enhancements"
+ showcontent = true
+
[[tool.towncrier.type]]
directory = "bugfix"
name = "Bugfixes"