diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
index 470a5c9..9f595a6 100644
--- a/doc/mpdconf.dist
+++ b/doc/mpdconf.dist
@@ -10,14 +10,14 @@
 # be disabled and audio files will only be accepted over ipc socket (using
 # file:// protocol) or streaming files over an accepted protocol.
 #
-#music_directory		"~/music"
+music_directory			"/var/lib/mpd/music"
 #
 # This setting sets the MPD internal playlist directory. The purpose of this
 # directory is storage for playlists created by MPD. The server will use 
 # playlist files not created by the server but only if they are in the MPD
 # format. This setting defaults to playlist saving being disabled.
 #
-#playlist_directory		"~/.mpd/playlists"
+playlist_directory		"/var/lib/mpd/playlists"
 #
 # This setting sets the location of the MPD database. This file is used to
 # load the database at server start up and store the database while the 
@@ -25,7 +25,7 @@
 # MPD to accept files over ipc socket (using file:// protocol) or streaming
 # files over an accepted protocol.
 #
-#db_file			"~/.mpd/database"
+db_file			"/var/lib/mpd/database"
 # 
 # These settings are the locations for the daemon log files for the daemon.
 # These logs are great for troubleshooting, depending on your log_level
@@ -34,20 +34,20 @@
 # The special value "syslog" makes MPD use the local syslog daemon. This
 # setting defaults to logging to syslog, otherwise logging is disabled.
 #
-#log_file			"~/.mpd/log"
+log_file			"/var/lib/mpd/log"
 #
 # This setting sets the location of the file which stores the process ID
-# for use of mpd --kill and some init scripts. This setting is disabled by
-# default and the pid file will not be stored.
+# for use of mpd --kill and some init scripts. This setting is required when
+# using the Gentoo init script.
 #
-#pid_file			"~/.mpd/pid"
+pid_file			"/var/lib/mpd/pid"
 #
 # This setting sets the location of the file which contains information about
 # most variables to get MPD back into the same general shape it was in before
 # it was brought down. This setting is disabled by default and the server 
 # state will be reset on server start up.
 #
-#state_file			"~/.mpd/state"
+state_file			"/var/lib/mpd/state"
 #
 # The location of the sticker database.  This is a database which
 # manages dynamic information attached to songs.
@@ -64,7 +64,7 @@
 # initialization. This setting is disabled by default and MPD is run as the
 # current user.
 #
-#user				"nobody"
+user				"mpd"
 #
 # This setting specifies the group that MPD will run as. If not specified
 # primary group of user specified with "user" setting will be used (if set).
@@ -78,10 +78,10 @@
 # This setting can deny access to control of the daemon.
 #
 # For network
-#bind_to_address		"any"
+bind_to_address		"localhost"
 #
 # And for Unix Socket
-#bind_to_address		"~/.mpd/socket"
+bind_to_address		"/var/lib/mpd/socket"
 #
 # This setting is the TCP port that is desired for the daemon to get assigned
 # to.