diff --git a/CHANGELOG b/CHANGELOG
index 283bcfcfbf686993a0fd27f1e60b1c24bdd308f5..edff0877ed06f180ec16dfcc861334313637b395 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,94 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
+0.14.1 (2018-06-06)
+-------------------
+
+Upgrade instructions are available at https://docs.funkwhale.audio/upgrading.html
+
+Enhancements:
+
+- Display server version in the footer (#270)
+- fix_track_files will now update files with bad mimetype (and not only the one
+ with no mimetype) (#273)
+- Huge performance boost (~x5 to x7) during CLI import that queries MusicBrainz
+ (#288)
+- Removed alpha-state transcoding support (#271)
+
+Bugfixes:
+
+- Broken logging statement during import error (#274)
+- Broken search bar on library home (#278)
+- Do not crash when importing track with an artist that do not match the
+ release artist (#237)
+- Do not crash when tag contains multiple uuids with a / separator (#267)
+- Ensure we do not store bad mimetypes (such as application/x-empty) (#266)
+- Fix broken "play all" button that played only 25 tracks (#281)
+- Fixed broken track download modal (overflow and wrong URL) (#239)
+- Removed hardcoded size limit in file upload widget (#275)
+
+
+Documentation:
+
+- Added warning about _protected/music location in nginx configuration (#247)
+
+
+Removed alpha-state transcoding (#271)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A few months ago, a basic transcoding feature was implemented. Due to the way
+this feature was designed, it was slow, CPU intensive on the server side,
+and very tightly coupled to the reverse-proxy configuration, preventing
+it to work Apache2, for instance. It was also not compatible with Subsonic clients.
+
+Based on that, we're currently removing support for transcoding
+**in its current state**. The work on a better designed transcoding feature
+can be tracked in https://code.eliotberriot.com/funkwhale/funkwhale/issues/272.
+
+You don't have to do anything on your side, but you may want to remove
+the now obsolete configuration from your reverse proxy file (nginx only)::
+
+ # Remove those blocks:
+
+ # transcode cache
+ proxy_cache_path /tmp/funkwhale-transcode levels=1:2 keys_zone=transcode:10m max_size=1g inactive=7d;
+
+ # Transcoding logic and caching
+ location = /transcode-auth {
+ include /etc/nginx/funkwhale_proxy.conf;
+ # needed so we can authenticate transcode requests, but still
+ # cache the result
+ internal;
+ set $query '';
+ # ensure we actually pass the jwt to the underlytin auth url
+ if ($request_uri ~* "[^\?]+\?(.*)$") {
+ set $query $1;
+ }
+ proxy_pass http://funkwhale-api/api/v1/trackfiles/viewable/?$query;
+ proxy_pass_request_body off;
+ proxy_set_header Content-Length "";
+ }
+
+ location /api/v1/trackfiles/transcode/ {
+ include /etc/nginx/funkwhale_proxy.conf;
+ # this block deals with authenticating and caching transcoding
+ # requests. Caching is heavily recommended as transcoding
+ # is a CPU intensive process.
+ auth_request /transcode-auth;
+ if ($args ~ (.*)jwt=[^&]*(.*)) {
+ set $cleaned_args $1$2;
+ }
+ proxy_cache_key "$scheme$request_method$host$uri$is_args$cleaned_args";
+ proxy_cache transcode;
+ proxy_cache_valid 200 7d;
+ proxy_ignore_headers "Set-Cookie";
+ proxy_hide_header "Set-Cookie";
+ add_header X-Cache-Status $upstream_cache_status;
+ proxy_pass http://funkwhale-api;
+ }
+ # end of transcoding logic
+
+
0.14 (2018-06-02)
-----------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 0896aba8a73279d59aca4b8af0013dfab1ec2943..8b5b81ad4b070cafc4de189a439c46a8195efebd 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
-__version__ = '0.14'
+__version__ = '0.14.1'
__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/237.bugfix b/changes/changelog.d/237.bugfix
deleted file mode 100644
index 8b529f5fdfa4f84c6c83701418e1a5d3d3e48dc4..0000000000000000000000000000000000000000
--- a/changes/changelog.d/237.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not crash when importing track with an artist that do not match the release artist (#237)
diff --git a/changes/changelog.d/239.bugfix b/changes/changelog.d/239.bugfix
deleted file mode 100644
index 169bf6b896f337db8a20d3c682acc9e090a6dfbc..0000000000000000000000000000000000000000
--- a/changes/changelog.d/239.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken track download modal (overflow and wrong URL) (#239)
diff --git a/changes/changelog.d/247.doc b/changes/changelog.d/247.doc
deleted file mode 100644
index c2c237a97854b5b3b94f6153fb1169efd3d0e8ac..0000000000000000000000000000000000000000
--- a/changes/changelog.d/247.doc
+++ /dev/null
@@ -1 +0,0 @@
-Added warning about _protected/music location in nginx configuration (#247)
diff --git a/changes/changelog.d/266.bugfix b/changes/changelog.d/266.bugfix
deleted file mode 100644
index c282afe7d885468a260fa0290abf96004450ed71..0000000000000000000000000000000000000000
--- a/changes/changelog.d/266.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure we do not store bad mimetypes (such as application/x-empty) (#266)
diff --git a/changes/changelog.d/267.bugfix b/changes/changelog.d/267.bugfix
deleted file mode 100644
index 8d0bfa5c5955440e917e184494945fc87a5bfccf..0000000000000000000000000000000000000000
--- a/changes/changelog.d/267.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not crash when tag contains multiple uuids with a / separator (#267)
diff --git a/changes/changelog.d/270.enhancement b/changes/changelog.d/270.enhancement
deleted file mode 100644
index 1d035640d74226ff4bbd3a7371471953b6ebe37a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/270.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Display server version in the footer (#270)
diff --git a/changes/changelog.d/271.enhancement b/changes/changelog.d/271.enhancement
deleted file mode 100644
index 5db9ec341543b483915587ef1e1b99e4d80e9233..0000000000000000000000000000000000000000
--- a/changes/changelog.d/271.enhancement
+++ /dev/null
@@ -1,57 +0,0 @@
-Removed transcoding support (#271)
-
-
-Removed alpha-state transcoding (#271)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A few months ago, a basic transcoding feature was implemented. Due to the way
-this feature was designed, it was slow, CPU intensive on the server side,
-and very tightly coupled to the reverse-proxy configuration, preventing
-it to work Apache2, for instance. It was also not compatible with Subsonic clients.
-
-Based on that, we're currently removing support for transcoding
-**in its current state**. The work on a better designed transcoding feature
-can be tracked in https://code.eliotberriot.com/funkwhale/funkwhale/issues/272.
-
-You don't have to do anything on your side, but you may want to remove
-the now obsolete configuration from your reverse proxy file (nginx only)::
-
- # Remove those blocks:
-
- # transcode cache
- proxy_cache_path /tmp/funkwhale-transcode levels=1:2 keys_zone=transcode:10m max_size=1g inactive=7d;
-
- # Transcoding logic and caching
- location = /transcode-auth {
- include /etc/nginx/funkwhale_proxy.conf;
- # needed so we can authenticate transcode requests, but still
- # cache the result
- internal;
- set $query '';
- # ensure we actually pass the jwt to the underlytin auth url
- if ($request_uri ~* "[^\?]+\?(.*)$") {
- set $query $1;
- }
- proxy_pass http://funkwhale-api/api/v1/trackfiles/viewable/?$query;
- proxy_pass_request_body off;
- proxy_set_header Content-Length "";
- }
-
- location /api/v1/trackfiles/transcode/ {
- include /etc/nginx/funkwhale_proxy.conf;
- # this block deals with authenticating and caching transcoding
- # requests. Caching is heavily recommended as transcoding
- # is a CPU intensive process.
- auth_request /transcode-auth;
- if ($args ~ (.*)jwt=[^&]*(.*)) {
- set $cleaned_args $1$2;
- }
- proxy_cache_key "$scheme$request_method$host$uri$is_args$cleaned_args";
- proxy_cache transcode;
- proxy_cache_valid 200 7d;
- proxy_ignore_headers "Set-Cookie";
- proxy_hide_header "Set-Cookie";
- add_header X-Cache-Status $upstream_cache_status;
- proxy_pass http://funkwhale-api;
- }
- # end of transcoding logic
diff --git a/changes/changelog.d/273.enhancement b/changes/changelog.d/273.enhancement
deleted file mode 100644
index c1d634e030970057bdc08632c5128d6e6e2b1294..0000000000000000000000000000000000000000
--- a/changes/changelog.d/273.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_track_files will now update files with bad mimetype (and not only
-the one with no mimetype) (#273)
diff --git a/changes/changelog.d/274.bugfix b/changes/changelog.d/274.bugfix
deleted file mode 100644
index c4c5a3aecccd1ddbcd62c3a3a35a2937455853fe..0000000000000000000000000000000000000000
--- a/changes/changelog.d/274.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Broken logging statement during import error (#274)
diff --git a/changes/changelog.d/275.bugfix b/changes/changelog.d/275.bugfix
deleted file mode 100644
index 612d382a9447800a1e1fd92a139b5b5b939c30b8..0000000000000000000000000000000000000000
--- a/changes/changelog.d/275.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Removed hardcoded size limit in file upload widget (#275)
diff --git a/changes/changelog.d/278.bugfix b/changes/changelog.d/278.bugfix
deleted file mode 100644
index e1d831de166d25d9c46e134e96d3255af12e3ef6..0000000000000000000000000000000000000000
--- a/changes/changelog.d/278.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Broken search bar on library home (#278)
diff --git a/changes/changelog.d/281.bugfix b/changes/changelog.d/281.bugfix
deleted file mode 100644
index 0984421a244b34b16b1e59e5adc3e45ccc2aab44..0000000000000000000000000000000000000000
--- a/changes/changelog.d/281.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken "play all" button that played only 25 tracks (#281)
diff --git a/changes/changelog.d/288.enhancement b/changes/changelog.d/288.enhancement
deleted file mode 100644
index 7125bdb710162d208ec73f1b2dbe1a141b9d478a..0000000000000000000000000000000000000000
--- a/changes/changelog.d/288.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Huge performance boost (~x5 to x7) during CLI import that queries MusicBrainz (#288)
diff --git a/changes/template.rst b/changes/template.rst
index 24f0e87ebc16c474c7b44841114816ab0f6fcb2f..9ffcdc08e6317223ad2f3cf39aedf85da826ecbb 100644
--- a/changes/template.rst
+++ b/changes/template.rst
@@ -1,5 +1,6 @@
-Upgrade instructions are available at https://docs.funkwhale.audio/upgrading.html
+Upgrade instructions are available at
+https://docs.funkwhale.audio/upgrading.html
{% for section, _ in sections.items() %}
{% if sections[section] %}