diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 2b2f08cfdd24..fcab163e18e8 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	freetype
 # Date created:		January 24, 1998
 # Whom:			jseger@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	freetype2
 PORTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	TOP=""
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	builds/unix/configure
 CONFIGURE_ARGS=	--disable-nls
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
 post-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
 
 .include <bsd.port.mk>
diff --git a/print/freetype2/files/patch-src_gzip_ftgzip.c b/print/freetype2/files/patch-src_gzip_ftgzip.c
new file mode 100644
index 000000000000..260fa8e479b3
--- /dev/null
+++ b/print/freetype2/files/patch-src_gzip_ftgzip.c
@@ -0,0 +1,20 @@
+--- src/gzip/ftgzip.c.orig	Sat Jan 18 13:04:29 2003
++++ src/gzip/ftgzip.c	Sat Jan 18 13:04:40 2003
+@@ -177,7 +177,7 @@
+     (void)FT_STREAM_SKIP( 6 );
+ 
+     /* skip the extra field */
+-    if ( head[3] && FT_GZIP_EXTRA_FIELD )
++    if ( head[3] & FT_GZIP_EXTRA_FIELD )
+     {
+       FT_UInt  len;
+ 
+@@ -187,7 +187,7 @@
+     }
+ 
+     /* skip original file name */
+-    if ( head[3] && FT_GZIP_ORIG_NAME )
++    if ( head[3] & FT_GZIP_ORIG_NAME )
+       for (;;)
+       {
+         FT_UInt  c;
diff --git a/print/freetype2/files/patch-src_gzip_infcodes.c b/print/freetype2/files/patch-src_gzip_infcodes.c
new file mode 100644
index 000000000000..c8d8f911f1ff
--- /dev/null
+++ b/print/freetype2/files/patch-src_gzip_infcodes.c
@@ -0,0 +1,13 @@
+--- src/gzip/infcodes.c.orig	Sat Jan 18 15:44:46 2003
++++ src/gzip/infcodes.c	Sat Jan 18 15:46:10 2003
+@@ -196,8 +196,8 @@
+       c->mode = COPY;
+     case COPY:          /* o: copying bytes in window, waiting for space */
+       f = q - c->sub.copy.dist;
+-      while (f < s->window)             /* modulo window size-"while" instead */
+-        f += s->end - s->window;        /* of "if" handles invalid distances */
++      if ((uInt)(q - s->window) < c->sub.copy.dist)
++	  f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
+       while (c->len)
+       {
+         NEEDOUT