diff --git a/docs/config.rst b/docs/config.rst
index e12c152e..b6be6cfa 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -61,13 +61,6 @@ Mopidy's core has the following configuration values that you can change.
 Core configuration
 ------------------
 
-.. confval:: core/max_tracklist_length
-
-    Max length of the tracklist. Defaults to 10000.
-
-    The original MPD server only supports 10000 tracks in the tracklist. Some
-    MPD clients will crash if this limit is exceeded.
-
 .. confval:: core/cache_dir
 
     Path to directory for storing cached information.
@@ -80,6 +73,13 @@ Core configuration
 
     Path to directory with data files.
 
+.. confval:: core/max_tracklist_length
+
+    Max length of the tracklist. Defaults to 10000.
+
+    The original MPD server only supports 10000 tracks in the tracklist. Some
+    MPD clients will crash if this limit is exceeded.
+
 
 Audio configuration
 -------------------
diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py
index df5b73bc..561d202a 100644
--- a/mopidy/config/__init__.py
+++ b/mopidy/config/__init__.py
@@ -16,11 +16,11 @@ from mopidy.internal import path, versioning
 logger = logging.getLogger(__name__)
 
 _core_schema = ConfigSchema('core')
-# MPD supports at most 10k tracks, some clients segfault when this is exceeded.
-_core_schema['max_tracklist_length'] = Integer(minimum=1, maximum=10000)
 _core_schema['cache_dir'] = Path()
 _core_schema['config_dir'] = Path()
 _core_schema['data_dir'] = Path()
+# MPD supports at most 10k tracks, some clients segfault when this is exceeded.
+_core_schema['max_tracklist_length'] = Integer(minimum=1, maximum=10000)
 
 _logging_schema = ConfigSchema('logging')
 _logging_schema['color'] = Boolean()
diff --git a/mopidy/config/default.conf b/mopidy/config/default.conf
index 5e749f0c..675381d9 100644
--- a/mopidy/config/default.conf
+++ b/mopidy/config/default.conf
@@ -1,8 +1,8 @@
 [core]
-max_tracklist_length = 10000
 cache_dir = $XDG_CACHE_DIR/mopidy
 config_dir = $XDG_CONFIG_DIR/mopidy
 data_dir = $XDG_DATA_DIR/mopidy
+max_tracklist_length = 10000
 
 [logging]
 color = true