diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index b2e831b..ea7ea33 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -449,9 +449,9 @@ executed in your Internet Explorer while displaying the email.</p>
     <affects>
       <package>
         <name>squid</name>
-        <range><lt>3.1.22</lt></range>
-        <range><ge>3.2</ge><lt>3.2.4</lt></range>
-        <range><ge>3.3</ge><lt>3.3.0.2</lt></range>
+        <range><lt>3.1.23</lt></range>
+        <range><ge>3.2</ge><lt>3.2.6</lt></range>
+        <range><ge>3.3</ge><lt>3.3.0.3</lt></range>
       </package>
     </affects>
     <description>
@@ -476,6 +476,7 @@ executed in your Internet Explorer while displaying the email.</p>
     <dates>
       <discovery>2012-12-17</discovery>
       <entry>2012-12-28</entry>
+      <modified>2013-01-09</modified>
     </dates>
   </vuln>
 
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 28d207e..6ff4cf4 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -48,7 +48,6 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.1.${SQUID_STABLE_VER}
-PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -78,7 +77,7 @@ PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v3/3.1/changesets
-PATCHFILES=	squid-3.1-10483.patch
+PATCHFILES=
 
 MAINTAINER=	tmseck@web.de
 COMMENT=	HTTP Caching Proxy
@@ -91,7 +90,7 @@ LATEST_LINK=	squid31
 DEPRECATED=	Squid 3.1 is no longer recommended for new installations. Please use www/squid32 instead
 EXPIRATION_DATE=	2013-03-31
 
-SQUID_STABLE_VER=	22
+SQUID_STABLE_VER=	23
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 3482173..ef87bb3 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,4 +1,2 @@
-SHA256 (squid3.1/squid-3.1.22.tar.bz2) = 16fe2313f981ede1c945eebe3743d8f835e724c6dae296bfc1200af555549424
-SIZE (squid3.1/squid-3.1.22.tar.bz2) = 2560270
-SHA256 (squid3.1/squid-3.1-10483.patch) = ac871ad6e078ecc0f2ef0d32f7cbca26a1472d976e749177e60ee644878b0f42
-SIZE (squid3.1/squid-3.1-10483.patch) = 1746
+SHA256 (squid3.1/squid-3.1.23.tar.bz2) = ba8041d23ef168dee755ca0d343c28b117011f02abfabbf3a7b623f21ef0e48d
+SIZE (squid3.1/squid-3.1.23.tar.bz2) = 2560454
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index cf95369..061041c 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -65,10 +65,7 @@ PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v3/3.2/changesets
-PATCHFILES=	squid-3.2-11740.patch \
-		squid-3.2-11741.patch \
-		squid-3.2-11742.patch \
-		squid-3.2-11743.patch
+PATCHFILES=
 
 MAINTAINER=	tmseck@web.de
 COMMENT=	HTTP Caching Proxy
@@ -78,7 +75,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LATEST_LINK=	squid32
 
-SQUID_STABLE_VER=	5
+SQUID_STABLE_VER=	6
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid32/distinfo b/www/squid32/distinfo
index 3950d08..2a8d595 100644
--- a/www/squid32/distinfo
+++ b/www/squid32/distinfo
@@ -1,10 +1,2 @@
-SHA256 (squid3.2/squid-3.2.5.tar.bz2) = a823de016ca80680f979f3c74ba481775062b4de5924b21d58d1863254283912
-SIZE (squid3.2/squid-3.2.5.tar.bz2) = 2893104
-SHA256 (squid3.2/squid-3.2-11740.patch) = eec9b1beeccfcb436170fc9902104cea2efd6c5dddfe368c8040b45c1513ca1c
-SIZE (squid3.2/squid-3.2-11740.patch) = 1710
-SHA256 (squid3.2/squid-3.2-11741.patch) = b93fc059dc1e0c0f84cb1e9873c3cc156b832410c3a60e18f1ecb58262a13e56
-SIZE (squid3.2/squid-3.2-11741.patch) = 1842
-SHA256 (squid3.2/squid-3.2-11742.patch) = 0cf97b177813136c28889c0ce2a05ab0b3fac214465bc6d741c6728a225ad49a
-SIZE (squid3.2/squid-3.2-11742.patch) = 2611
-SHA256 (squid3.2/squid-3.2-11743.patch) = 8ce53eee452b00e7c4d23f3fbe930d44d50c9981d3633d64c198c43df7da8422
-SIZE (squid3.2/squid-3.2-11743.patch) = 1740
+SHA256 (squid3.2/squid-3.2.6.tar.bz2) = d48567bdd703e86900b9456f8bbdb554729fa15f579c6f2212bcd2ab6dca3324
+SIZE (squid3.2/squid-3.2.6.tar.bz2) = 2893158