diff --git a/configure.ac b/configure.ac
index 396a2e624..617a048f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c)
 dnl AM_INIT_AUTOMAKE(mpd, 0.10.0)
 
 AC_PREREQ(2.52)
-AC_INIT(mpd, 0.12.0, shank@mercury.chem.pitt.edu)
+AC_INIT(mpd, 0.11.4, shank@mercury.chem.pitt.edu)
 AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
 
 dnl MAD wants this stuff
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 73d9379a5..db5756b95 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -246,7 +246,10 @@ static MpdTag * mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize) {
 
 	id3Tag = id3_tag_parse(id3_data, tagsize);
  
-	ret = parseId3Tag(id3Tag);
+	if(id3Tag) {
+		ret = parseId3Tag(id3Tag);
+		id3_tag_delete(id3Tag);
+	}
 
 fail:
 	if(allocated) free(allocated);
@@ -272,7 +275,8 @@ int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag) {
 
 			if(tagsize>0) {
 				if(tag && !(*tag)) {
-					*tag =mp3_parseId3Tag(data, tagsize);
+					*tag = mp3_parseId3Tag(data, tagsize);
+					
 				}
 				else {
 					mad_stream_skip(&(data->stream),