diff --git a/NEWS b/NEWS
index 4969dc91b..2e314295a 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.15.6 (2009/??/??)
   - ffmpeg: convert metadata
 * output_thread: check again if output is open on PAUSE
 * update: delete ignored symlinks from database
+* database: increased maximum line length to 32 kB
 
 
 ver 0.15.5 (2009/10/18)
diff --git a/src/song_save.c b/src/song_save.c
index 8f4e1614d..2d6297f3e 100644
--- a/src/song_save.c
+++ b/src/song_save.c
@@ -21,7 +21,6 @@
 #include "song.h"
 #include "tag_save.h"
 #include "directory.h"
-#include "path.h"
 #include "tag.h"
 
 #include <glib.h>
@@ -113,12 +112,15 @@ matchesAnMpdTagItemKey(char *buffer, enum tag_type *itemType)
 void readSongInfoIntoList(FILE *fp, struct songvec *sv,
 			  struct directory *parent)
 {
-	char buffer[MPD_PATH_MAX + 1024];
+	enum {
+		buffer_size = 32768,
+	};
+	char *buffer = g_malloc(buffer_size);
 	struct song *song = NULL;
 	enum tag_type itemType;
 	const char *value;
 
-	while (fgets(buffer, sizeof(buffer), fp) &&
+	while (fgets(buffer, buffer_size, fp) &&
 	       !g_str_has_prefix(buffer, SONG_END)) {
 		g_strchomp(buffer);
 
@@ -156,6 +158,8 @@ void readSongInfoIntoList(FILE *fp, struct songvec *sv,
 			g_error("unknown line in db: %s", buffer);
 	}
 
+	g_free(buffer);
+
 	if (song)
 		insertSongIntoList(sv, song);
 }