diff --git a/src/decode.c b/src/decode.c
index 82909fcc7..b1c0bb012 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -47,8 +47,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#define FADE_CHUNKS	1024
-
 int * decode_pid = NULL;
 
 void decodeSigHandler(int sig) {
@@ -91,7 +89,7 @@ void quitDecode(PlayerControl * pc, DecoderControl * dc) {
 }
 
 int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
-	int chunks;
+	long chunks;
 
 	if(pc->crossFade<=0) return 0;
 
@@ -104,7 +102,7 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
 
 	if(chunks<0) chunks = 0;
 
-	return chunks;
+	return (int)chunks;
 }
 
 int waitOnDecode(PlayerControl * pc, AudioFormat * af, DecoderControl * dc,
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index 780c3814c..42afdac6a 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -25,6 +25,13 @@
 #else
 #include <mad.h>
 #endif
+#ifdef HAVE_ID3TAG
+#ifdef USE_MPD_ID3TAG
+#include "libid3tag/id3tag.h"
+#else
+#include <id3tag.h>
+#endif
+#endif
 #include "playerData.h"
 #include "log.h"
 
@@ -181,7 +188,19 @@ int decodeNextFrameHeader(mp3DecodeData * data) {
 		}
 	}
 	if(mad_header_decode(&data->frame.header,&data->stream)) {
-		if((data->stream).error==MAD_ERROR_LOSTSYNC) return DECODE_SKIP;
+		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
+#ifdef HAVE_ID3TAG
+			signed long tagsize = id3_tag_query(
+					(data->stream).this_frame,
+					(data->stream).bufend-
+					(data->stream).this_frame);
+			if(tagsize>0) {
+				mad_stream_skip(&(data->stream),tagsize);
+				return DECODE_CONT;
+			}
+#endif
+			return DECODE_SKIP;
+		}
 		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_CONT;
 		else {
 			if((data->stream).error==MAD_ERROR_BUFLEN) return DECODE_CONT;
@@ -206,7 +225,19 @@ int decodeNextFrame(mp3DecodeData * data) {
 		}
 	}
 	if(mad_frame_decode(&data->frame,&data->stream)) {
-		if((data->stream).error==MAD_ERROR_LOSTSYNC) return DECODE_SKIP;
+		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
+#ifdef HAVE_ID3TAG
+			signed long tagsize = id3_tag_query(
+					(data->stream).this_frame,
+					(data->stream).bufend-
+					(data->stream).this_frame);
+			if(tagsize>0) {
+				mad_stream_skip(&(data->stream),tagsize);
+				return DECODE_CONT;
+			}
+#endif
+			return DECODE_SKIP;
+		}
 		if(MAD_RECOVERABLE((data->stream).error)) return DECODE_CONT;
 		else {
 			if((data->stream).error==MAD_ERROR_BUFLEN) return DECODE_CONT;