diff --git a/ChangeLog b/ChangeLog
index ce03a54d0..26f7d4be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+ver 0.11.1 (2004/6/24)
+1) Fix a bug that caused "popping" at the beginning of mp3's
+2) Fix playlistid command
+3) Fix move commands so they don't mess up the song id's
+4) Added support for HTTP Proxy
+5) Detect and skip recursive links in the music directory
+6) Fix addPathToDB() so updating on a specific path doesn't exist correctly adds the parent directories to the DB
+
 ver 0.11.0 (2004/6/18)
 1) Support for playing mp3 and Ogg Vorbis streams
 2) Non-blocking Update
diff --git a/doc/mpd.1 b/doc/mpd.1
index d621e7002..2ce78829e 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -159,6 +159,18 @@ of libao on sound cards with very small buffers.
 .B save_absolute_paths_in_playlists <yes or no>
 This specifies whether relative or absolute paths for song filenames are
 used when saving playlists.  The default value is "no".
+.TP
+.B http_proxy_host <string>
+Use to specify the proxy host used for http connections.
+.TP
+.B http_proxy_port <port>
+The port that the http proxy host uses.
+.TP
+.B http_proxy_user <string>
+If the http proxy server requires authentication, this specifies the user.
+.TP
+.B http_proxy_password <string>
+If the http proxy server requires authentication, this specifies the password.
 .SH EXAMPLES
 .TP
 Below is an example config file. (Note: '#' at the beginning of a line denotes a comment.  The '#' must be the first character/symbol on that line.)
@@ -240,5 +252,13 @@ bind_to_address         "any"
 #filesystem_charset     "UTF-8"
 .br
 #replaygain		"album"
+.br
+#http_proxy_host	"proxy.isp.com"
+.br
+#http_proxy_port	"8080"
+.br
+#http_proxy_user	"user"
+.br
+#http_proxy_password	"password"
 .SH SEE ALSO
 mpc(1)
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 6c5c7b26e..a0a580400 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -79,6 +79,14 @@ error_file 		"~/.mpd/mpd.error"
 ##################################
 
 
+############ HTTP PROXY ################
+# http_proxy_host	"proxy.isp.com"
+# http_proxy_port	"8080"
+# http_proxy_user	"user"
+# http_proxy_password	"password"
+########################################
+
+
 ########### SECURITY SETTINGS ############
 # if you start mpd as root, its recommended
 #     you specify a a user for mpd to run.