diff --git a/www/squid/Makefile b/www/squid/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index d1367c83b50b..d8957ded1e0d 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -74,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +87,11 @@ DISTNAME=	squid-2.5.STABLE8
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch \
+		squid-2.5.STABLE8-relaxed_header_parser.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 16fbe56b2ed3..bd4999c9813d 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -2,3 +2,11 @@ MD5 (squid2.5/squid-2.5.STABLE8.tar.bz2) = 687db8c5f0fec3798dbc77f94340b185
 SIZE (squid2.5/squid-2.5.STABLE8.tar.bz2) = 1057299
 MD5 (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 84469625a7fbc1fae2c688346a356341
 SIZE (squid2.5/squid-2.5.STABLE8-dns_assert.patch) = 2524
+MD5 (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 6b17fda9d45dd638f5ce5ee230b9c091
+SIZE (squid2.5/squid-2.5.STABLE8-format_fixes.patch) = 10056
+MD5 (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 9211067e47c77f8879a8d202a22f2890
+SIZE (squid2.5/squid-2.5.STABLE8-html_high_chars.patch) = 766
+MD5 (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 2c886bae6720c9dfaf1993a04d592dbe
+SIZE (squid2.5/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532
+MD5 (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 43fb854177521ccb8348bf616fafd351
+SIZE (squid2.5/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217