diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2e9ca56a..ee2ddf8c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,9 @@ Bug fix release.
   (Fixes: :issue:`935`, :issue:`1453`, :issue:`1474` and :issue:`1480`
    PR: :issue:`1487`)
 
+- Core: Avoid endless loop if all tracks in the tracklist are unplayable and
+  consume mode is off. (Fixes: :issue:`1221`, :issue:`1454`, PR: :issue:`1455`)
+
 
 v2.0.0 (2016-02-15)
 ===================