diff --git a/.mailmap b/.mailmap
index 93a5573b..45935be6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,4 +16,4 @@ Janez Troha <janez.troha@gmail.com> <dz0ny@ubuntu.si>
 Luke Giuliani <luke@giuliani.com.au>
 Colin Montgomerie <kiteflyingmonkey@gmail.com>
 Ignasi Fosch <natx@y10k.ws> <ifosch@serenity-2.local>
-Christopher Schirner <schinken@hackerspace-bamberg.de>
+Christopher Schirner <christopher@hackerspace-bamberg.de> <schinken@hackerspace-bamberg.de>
diff --git a/AUTHORS b/AUTHORS
index ccca6979..cd347da8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,7 +42,8 @@
 - Sam Willcocks <sam@wlcx.cc>
 - Ignasi Fosch <natx@y10k.ws>
 - Arjun Naik <arjun@arjunnaik.in>
-- Christopher Schirner <schinken@hackerspace-bamberg.de>
+- Christopher Schirner <christopher@hackerspace-bamberg.de>
 - Dmitry Sandalov <dmitry@sandalov.org>
 - Lukas Vogel <lukas@vogelnest.org>
 - Thomas Amland <thomas.amland@gmail.com>
+- Deni Bertovic <deni@kset.org>
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c59822ae..2995f1a4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -39,8 +39,6 @@ v0.20.0 (UNRELEASED)
 - Add symlink support with loop protection to file finder (Fixes: :issue:`858`,
   PR: :isusue:`874`)
 
-- Fix scanning of modified files. (PR: :issue:`904`)
-
 **MPD frontend**
 
 - In stored playlist names, replace "/", which are illegal, with "|" instead of
@@ -49,11 +47,6 @@ v0.20.0 (UNRELEASED)
 - Enable browsing of artist references, in addition to albums and playlists.
   (PR: :issue:`884`)
 
-- Re-enable browsing of empty directories. (PR: :issue:`906`)
-
-- Quick workaround for :issue:`881`, which allows for newlines in comments.
-  (PR: :issue:`882`)
-
 **Audio**
 
 - Deprecated :meth:`mopidy.audio.Audio.emit_end_of_stream`. Pass a
@@ -93,6 +86,13 @@ Bug fix release.
   :attr:`mopidy.models.Track.track_no`, and
   :attr:`mopidy.models.Track.last_modified` from ``0`` to :class:`None`.
 
+- Local: Fix scanning of modified files. (PR: :issue:`904`)
+
+- MPD: Re-enable browsing of empty directories. (PR: :issue:`906`)
+
+- MPD: Remove track comments from responses. They are not included by the
+  original MPD server, and this works around :issue:`881`. (PR: :issue:`882`)
+
 
 v0.19.4 (2014-09-01)
 ====================