diff --git a/ChangeLog b/ChangeLog
index 9820c8b4b..18f7eb1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ ver 0.13.0 (2007/??/??)
 * New playlistmove command for moving songs in stored playlists
 * New playlistdelete command for deleting songs from stored playlists
 * New rename command for renaming stored playlists
+* Increased default buffer_before_play from 0% to 10% to prevent skipping
 * Lots of bug fixes, cleaned up code, and performance improvements
 
 ver 0.12.2 (2007/3/20)
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 48926fd29..efe95167d 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -171,7 +171,8 @@ large enough for nearly 12 seconds of CD-quality audio.
 .B buffer_before_play <0-100%>
 This specifies how much of the audio buffer should be filled before playing a
 song.  Try increasing this if you hear skipping when manually changing songs.
-The default is 0%.
+The default is 10%, a little over 1 second of CD-quality audio with the default
+buffer size.
 .TP
 .B http_buffer_size <size in KiB>
 This specifies the size of the buffer used for playing HTTP streams.  The
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index c6dc24dca..8cd367541 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -190,7 +190,7 @@ error_file                      "~/.mpd/mpd.error"
 # How much of the buffer to fill before beginning to play.
 # Increase this if you hear skipping when changing songs.
 #
-#buffer_before_play              "0%"
+#buffer_before_play              "10%"
 #
 # Similar options for the HTTP stream buffer.  If you hear
 # skipping while playing HTTP streams, you may wish to increase
diff --git a/src/playerData.c b/src/playerData.c
index e0c3abfe4..30ff6d6d6 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -31,8 +31,8 @@
 int buffered_before_play;
 int buffered_chunks;
 
-#define DEFAULT_BUFFER_SIZE		2048
-#define DEFAULT_BUFFER_BEFORE_PLAY	0
+#define DEFAULT_BUFFER_SIZE         2048
+#define DEFAULT_BUFFER_BEFORE_PLAY  10
 
 static PlayerData *playerData_pd;