diff --git a/AUTHORS b/AUTHORS
index 110a9ec4..ccca6979 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,3 +44,5 @@
 - Arjun Naik <arjun@arjunnaik.in>
 - Christopher Schirner <schinken@hackerspace-bamberg.de>
 - Dmitry Sandalov <dmitry@sandalov.org>
+- Lukas Vogel <lukas@vogelnest.org>
+- Thomas Amland <thomas.amland@gmail.com>
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e652401..c59822ae 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -32,6 +32,15 @@ v0.20.0 (UNRELEASED)
   just like the other ``lookup()`` methods in Mopidy. For now, returning a
   single track will continue to work. (PR: :issue:`840`)
 
+**File scanner**
+
+- Improve error logging for scan code (Fixes: :issue:`856`, PR: :issue:`874`)
+
+- 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
@@ -40,6 +49,11 @@ 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