diff --git a/doc/mpd.1.rst b/doc/mpd.1.rst
index 7dbbb1344..5a1d47288 100644
--- a/doc/mpd.1.rst
+++ b/doc/mpd.1.rst
@@ -13,7 +13,7 @@ DESCRIPTION
 MPD is a daemon for playing music. Music is played through the configured audio output(s) (which are generally local, but can be remote). The daemon stores info about all available music, and this info can be easily searched and retrieved. Player control, info retrieval, and playlist management can all be managed remotely.
 
 MPD searches for a config file in ``$XDG_CONFIG_HOME/mpd/mpd.conf``
-then ``~/.mpdconf`` then ``/etc/mpd.conf`` or uses ``CONF_FILE``.
+then ``~/.mpdconf`` then ``~/.mpd/mpd.conf`` then ``/etc/mpd.conf`` or uses ``CONF_FILE``.
 
 Read more about MPD at http://www.musicpd.org/
 
@@ -53,8 +53,8 @@ OPTIONS
 FILES
 -----
 
-:file:`~/.mpdconf`
-  User configuration file.
+:file:`$XDG_CONFIG_HOME/mpd/mpd.conf`
+  User configuration file (usually :file:`~/.config/mpd/mpd.conf`).
 
 :file:`/etc/mpd.conf`
   Global configuration file.