diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index e7e76b2410f4..672a788395c1 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,44 +1,45 @@
 # New ports collection makefile for:	varnish
 # Date created:				2006-08-11
 # Whom:					des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	varnish
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	The Varnish high-performance HTTP accelerator
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
 		varnishstat.1 varnishtest.1 varnishtop.1
 MAN7=		vcl.7
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 601000
 BROKEN=		does not compile
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/varnish/files/patch-r4758 b/www/varnish/files/patch-r4758
new file mode 100644
index 000000000000..3603d37e2054
--- /dev/null
+++ b/www/varnish/files/patch-r4758
@@ -0,0 +1,13 @@
+Index: bin/varnishd/cache_response.c
+===================================================================
+--- bin/varnishd/cache_response.c	(revision 4757)
++++ bin/varnishd/cache_response.c	(revision 4758)
+@@ -325,7 +325,7 @@
+ 		}
+ 		if (ptr + len > high)
+ 			/* Chop tail of segment off */
+-			len = 1 + high - low;
++			len = 1 + high - ptr;
+ 
+ 		ptr += len;
+ 
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile
index e7e76b2410f4..672a788395c1 100644
--- a/www/varnish2/Makefile
+++ b/www/varnish2/Makefile
@@ -1,44 +1,45 @@
 # New ports collection makefile for:	varnish
 # Date created:				2006-08-11
 # Whom:					des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	varnish
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	The Varnish high-performance HTTP accelerator
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
 		varnishstat.1 varnishtest.1 varnishtop.1
 MAN7=		vcl.7
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 601000
 BROKEN=		does not compile
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/varnish2/files/patch-r4758 b/www/varnish2/files/patch-r4758
new file mode 100644
index 000000000000..3603d37e2054
--- /dev/null
+++ b/www/varnish2/files/patch-r4758
@@ -0,0 +1,13 @@
+Index: bin/varnishd/cache_response.c
+===================================================================
+--- bin/varnishd/cache_response.c	(revision 4757)
++++ bin/varnishd/cache_response.c	(revision 4758)
+@@ -325,7 +325,7 @@
+ 		}
+ 		if (ptr + len > high)
+ 			/* Chop tail of segment off */
+-			len = 1 + high - low;
++			len = 1 + high - ptr;
+ 
+ 		ptr += len;
+