diff --git a/mail/normalizemime/Makefile b/mail/normalizemime/Makefile
index 3d2c44d5fd1d..a9784180ed5d 100644
--- a/mail/normalizemime/Makefile
+++ b/mail/normalizemime/Makefile
@@ -1,43 +1,38 @@
 # New ports collection makefile for:	normalize mime
 # Date created:		Wed Aug 31 00:24:53 UTC 2005
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	normalizemime
 PORTVERSION=	1.16.20050628
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/spam/
 DISTNAME=	normalizemime.cc
 EXTRACT_SUFX=
 EXTRACT_ONLY=
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A mime normalizer to be used as a preprocessor for email classication
 
 USE_ICONV=	yes
 NO_WRKSUBDIR=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 
 PLIST_FILES=	bin/${DISTNAME:R}
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${WRKSRC}
 
 do-build:
 	@cd ${WRKSRC} && ${CXX} ${CXXFLAGS} ${LDFLAGS} \
 		${DISTNAME} -o ${DISTNAME:R}
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:R} ${PREFIX}/bin
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-USE_GCC=3.4+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/normalizemime/files/patch-normalizemime.cc b/mail/normalizemime/files/patch-normalizemime.cc
index f8974d60cd14..f8a19545ae74 100644
--- a/mail/normalizemime/files/patch-normalizemime.cc
+++ b/mail/normalizemime/files/patch-normalizemime.cc
@@ -1,11 +1,20 @@
---- normalizemime.cc.orig	Tue Aug 30 21:31:02 2005
-+++ normalizemime.cc	Tue Aug 30 21:33:08 2005
-@@ -498,7 +498,7 @@
+--- normalizemime.cc.orig	Tue Sep 13 00:03:52 2005
++++ normalizemime.cc	Tue Sep 13 00:04:18 2005
+@@ -58,6 +58,8 @@
+ #include <map>
+ #include <string>
+ 
++#include <sys/types.h>
++
+ #include <regex.h>
+ #include <assert.h>
+ #include <ctype.h>
+@@ -498,7 +500,7 @@
    char *obuf = buf;
    memcpy (icopy, message.c_str(), in_left);
    message.erase ();
 -  char *ibuf = icopy;
 +  const char *ibuf = icopy;
  
    while (in_left > 0) {
      if ((size_t)(-1) == iconv (ic, &ibuf, &in_left, &obuf, &out_left)) {