diff --git a/docs/changelog.rst b/docs/changelog.rst
index 175a3b99..1558042b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -33,6 +33,9 @@ Core API
 
 - Update core to handle backend crashes and bad data. (Fixes: :issue:`1161`)
 
+- Add `max_tracklist_length` config and limitation. (Fixes: :issue:`997`
+  PR: :issue:`1225`)
+
 Models
 ------
 
diff --git a/mopidy/config/default.conf b/mopidy/config/default.conf
index 42edbbbd..c214de68 100644
--- a/mopidy/config/default.conf
+++ b/mopidy/config/default.conf
@@ -1,3 +1,6 @@
+[core]
+max_tracklist_length = 10000
+
 [logging]
 color = true
 console_format = %(levelname)-8s %(message)s
diff --git a/mopidy/core/ext.conf b/mopidy/core/ext.conf
deleted file mode 100644
index f186adf0..00000000
--- a/mopidy/core/ext.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[core]
-enabled = true
-max_tracklist_length = 10000