diff --git a/doc/mpd.1 b/doc/mpd.1
index 42de10740..8f0458085 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -137,7 +137,7 @@ This specifies the maximum size a command list can be (in kilobytes). The defaul
 .TP
 .B max_output_buffer_size <size in KB>
 This specifies the maximum size of the output buffer to a client (in kilobytes).
-The default is 2048 kilobytes.
+The default is 8192 kilobytes.
 .TP
 .B ao_driver <ao plug-in>
 This specifies the ao plug-in to use for audio output.  Typical values for
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 0b37d9f9a..fbf25b53d 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -222,7 +222,7 @@ pid_file 		"~/.mpd/mpd.pid"
 # No need to change these unless you know better.
 #
 #max_command_list_size 	"2048"
-#max_output_buffer_size "2048"
+#max_output_buffer_size "8192"
 #
 # This will make playlists compatible with normal music
 # players.
diff --git a/src/interface.c b/src/interface.c
index 464e1503d..e7be3a71d 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -51,7 +51,7 @@
 #define INTERFACE_TIMEOUT_DEFAULT			(60)
 #define INTERFACE_MAX_CONNECTIONS_DEFAULT		(10)
 #define INTERFACE_MAX_COMMAND_LIST_DEFAULT		(2048*1024)
-#define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT	(2048*1024)
+#define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT	(8192*1024)
 
 /* set this to zero to indicate we have no possible interfaces */
 static int interface_max_connections = 0; /*INTERFACE_MAX_CONNECTIONS_DEFAULT;*/