diff --git a/AUTHORS b/AUTHORS
index 439b8ed7..38c394dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,3 +75,4 @@
 - kozec <kozec@kozec.com>
 - Jelle van der Waa <jelle@vdwaa.nl>
 - Alex Malone <jalexmalone@gmail.com>
+- Daniel Hahler <git@thequod.de>
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0f9dacb6..3bda9237 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,12 @@ Models
   :meth:`mopidy.core.LibraryController.get_images` instead. (Fixes:
   :issue:`1325`)
 
+Extension support
+-----------------
+
+- Log exception and continue if an extension crashes during setup. Previously,
+  we let Mopidy crash if an extension's setup crashed. (PR: :issue:`1337`)
+
 Local backend
 --------------