diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 31b105c8d..ff24fd82a 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -66,7 +66,10 @@ the "kill" command.  When mpd is restarted, it will read the state file and
 restore the state of mpd (including the playlist).
 .TP
 .B user <username>
-This specifies the user that mpd will run as, if set.
+This specifies the user that MPD will run as, if set.  MPD should
+never run as root, and you may use this option to make MPD change its
+user id after initialization.  Do not use this option if you start MPD
+as an unprivileged user.
 .TP
 .B bind_to_address <ip address or hostname or any>
 This specifies which address mpd binds to and listens on.  Multiple
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 83109383e..83eb0ab16 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -30,10 +30,10 @@ error_file                      "~/.mpd/mpd.error"
 
 ######################## DAEMON OPTIONS ########################
 #
-# If started as root, MPD will drop root privileges and run as
-# this user instead.  Otherwise, MPD will run as the user it was
-# started by.  If left unspecified, MPD will not drop root
-# privileges at all (not recommended).
+# This specifies the user that MPD will run as, if set.  MPD should
+# never run as root, and you may use this option to make MPD change
+# its user id after initialization.  Do not use this option if you
+# start MPD as an unprivileged user.
 #
 #user                            "nobody"
 #