diff --git a/audio/mp3guessenc/Makefile b/audio/mp3guessenc/Makefile
index 655f1ced0eab..fa49aec0bae2 100644
--- a/audio/mp3guessenc/Makefile
+++ b/audio/mp3guessenc/Makefile
@@ -15,17 +15,13 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility for guessing which encoder was used to encode an mp3 file
 
 USE_ZIP=	yes
+USE_DOS2UNIX=	yes
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}
 
 PLIST_FILES=	bin/mp3guessenc
 
-post-extract:
-	@${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
-		${WRKSRC}/${PORTNAME}.c \
-		${WRKSRC}/VbrTag.h
-
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}
 
diff --git a/audio/mp3guessenc/files/patch-mp3guessenc.c b/audio/mp3guessenc/files/patch-mp3guessenc.c
index 294b8c30e67b..1aa1a3be4f79 100644
--- a/audio/mp3guessenc/files/patch-mp3guessenc.c
+++ b/audio/mp3guessenc/files/patch-mp3guessenc.c
@@ -1,5 +1,5 @@
---- mp3guessenc.c.orig	Sat Oct  1 00:34:43 2005
-+++ mp3guessenc.c	Sat Oct  1 00:38:22 2005
+--- ./mp3guessenc.c.orig	2011-06-21 21:09:47.000000000 +0200
++++ ./mp3guessenc.c	2011-06-21 21:11:00.000000000 +0200
 @@ -515,6 +515,7 @@
    for(q--;q >= lame_string && *q == 'U';q--) *q = '\0';
  
@@ -20,3 +20,30 @@
  
    fseek(input_file,0,SEEK_END);
    filesize = ftell(input_file);
+@@ -636,7 +640,7 @@
+     {
+       printf("Cannot find valid mp3 header, scanning failed\n");
+       fclose(input_file);
+-      return;
++      return(0);
+     }
+ 
+   // read VBR tag
+@@ -669,7 +673,7 @@
+       if (pos == -1) {
+ 	printf("Cannot find valid mp3 header, scanning failed\n");
+ 	fclose(input_file);
+-	return;
++	return(0);
+       }
+     }
+   }
+@@ -705,7 +709,7 @@
+ 	    "Free format bitstream is not supported.\n"
+ 	    "Sorry.\n");
+     fclose(input_file);
+-    return;
++    return(0);
+   }
+ 
+   crc = (head >> 16) & 1;