diff --git a/doc/mpd.conf.5.rst b/doc/mpd.conf.5.rst
index d6074cad6..3bc1ce2aa 100644
--- a/doc/mpd.conf.5.rst
+++ b/doc/mpd.conf.5.rst
@@ -15,6 +15,8 @@ Each line in the configuration file contains a setting name and its value, e.g.:
 
 :code:`connection_timeout "5"`
 
+Lines starting with ``#`` are treated as comments and ignored.
+
 For settings which specify a filesystem path, the tilde is expanded:
 
 :code:`music_directory "~/Music"`
diff --git a/doc/user.rst b/doc/user.rst
index f68d164e3..80da9dfda 100644
--- a/doc/user.rst
+++ b/doc/user.rst
@@ -240,6 +240,8 @@ Each line in the configuration file contains a setting name and its value, e.g.:
 
 :code:`connection_timeout "5"`
 
+Lines starting with ``#`` are treated as comments and ignored.
+
 For settings which specify a filesystem path, the tilde is expanded:
 
 :code:`music_directory "~/Music"`