diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e6872f4b67b1b77fa07dcf4c23f2553172b01f5..491ea7340e87986932a13970959e1affba82f41b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,38 +1 @@
-Changelog
-=========
-
-0.2.1
------
-
-2017-07-17
-
-* Now return media files with absolute URL
-* Now display CLI instructions to download a set of tracks
-* Fixed #33: sort by track position in album in API by default, also reuse that information on frontend side
-* More robust audio player and queue in various situations:
-* upgrade to latest dynamic_preferences and use redis as cache even locally
-
-
-0.2
--------
-
-2017-07-09
-
-* [feature] can now import artist and releases from youtube and musicbrainz.
-  This requires a YouTube API key for the search
-* [breaking] we now check for user permission before serving audio files, which requires
-  a specific configuration block in your reverse proxy configuration::
-
-    location /_protected/media {
-        internal;
-        alias   /srv/funkwhale/data/media;
-    }
-
-
-
-0.1
--------
-
-2017-06-26
-
-Initial release
+.. include:: ../CHANGELOG
diff --git a/docs/conf.py b/docs/conf.py
index 3a0c8f6f19d8a31d5e1f9ccb48bfa98d9c00fbdb..01da9bc05b473b280e53c6d29101a01b6027d6ab 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,9 +57,7 @@ author = 'Eliot Berriot'
 # built documents.
 #
 # The short X.Y version.
-# version = funkwhale_api.__version__
-# @TODO use real version here
-version = 'feature/22-debian-installation'
+version = funkwhale_api.__version__
 # The full version, including alpha/beta/rc tags.
 release = version