diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8ab2eca6800..ff395628b4b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,16 +1,26 @@
-# $OpenBSD: Makefile,v 1.51 2003/07/08 20:43:20 brad Exp $
+# $OpenBSD: Makefile,v 1.52 2003/07/23 01:47:20 brad Exp $
 
 COMMENT=	"WWW and FTP proxy cache and accelerator"
 
 DISTNAME=	squid-2.5.STABLE3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/
 MASTER_SITES0=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 DIST_SUBDIR=	squid
 
 PATCH_DIST_STRIP= -p1
-PATCHFILES=	squid-2.5.STABLE3-deny_info.patch:0
+PATCHFILES=	squid-2.5.STABLE3-deny_info.patch:0 \
+		squid-2.5.STABLE3-header_access_peer.patch:0 \
+		squid-2.5.STABLE3-memwarnsbrk.patch:0 \
+		squid-2.5.STABLE3-hostscomments.patch:0 \
+		squid-2.5.STABLE3-tcp_reset_leak.patch:0 \
+		squid-2.5.STABLE3-hostheader.patch:0 \
+		squid-2.5.STABLE3-reply_body_max_size.patch:0 \
+		squid-2.5.STABLE3-ie_refresh.patch:0 \
+		squid-2.5.STABLE3-http_reply_access-denied.patch:0 \
+		squid-2.5.STABLE3-SENT_PASV.patch:0 \
+		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch:0
 
 HOMEPAGE=	http://www.squid-cache.org/
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 2b253e35002..64b4aa8fad5 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,6 +1,36 @@
+MD5 (squid/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
 MD5 (squid/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
+MD5 (squid/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
+MD5 (squid/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
+MD5 (squid/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
+MD5 (squid/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
+MD5 (squid/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
+MD5 (squid/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
+MD5 (squid/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
+MD5 (squid/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
+MD5 (squid/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
 MD5 (squid/squid-2.5.STABLE3.tar.gz) = 08102bebafede61fd7ca8c1c1a9413d6
+RMD160 (squid/squid-2.5.STABLE3-SENT_PASV.patch) = e512cb587bb8496d63ac4410560ca4a80fd82175
 RMD160 (squid/squid-2.5.STABLE3-deny_info.patch) = fff3afcdce160075761a28f0eeb0dfb10abb6ffc
+RMD160 (squid/squid-2.5.STABLE3-header_access_peer.patch) = b29d756d76a728212936b9e2b7c6ed5fa9d7683b
+RMD160 (squid/squid-2.5.STABLE3-hostheader.patch) = b76d8f99da404d478855b0eebf384acf22f8b46f
+RMD160 (squid/squid-2.5.STABLE3-hostscomments.patch) = f64b62fc1c6d4db9960e0bf220a2c24edc7f1fa0
+RMD160 (squid/squid-2.5.STABLE3-http_reply_access-denied.patch) = fc516689f6d806458e97698021a4217e63a7caef
+RMD160 (squid/squid-2.5.STABLE3-ie_refresh.patch) = 5b4480498e8f6ade01c697af2fa6ca24790dcdd9
+RMD160 (squid/squid-2.5.STABLE3-memwarnsbrk.patch) = 1eeeb2b8d96c403b8937a5226ad2a0d196c9b294
+RMD160 (squid/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = e453359dec2fff64623603882f5642d33ae9cacd
+RMD160 (squid/squid-2.5.STABLE3-reply_body_max_size.patch) = 4df135b266ad30be9096b1d79b82e5e20c95c024
+RMD160 (squid/squid-2.5.STABLE3-tcp_reset_leak.patch) = 99f7f4261ff1868760fba266e05c403058776c31
 RMD160 (squid/squid-2.5.STABLE3.tar.gz) = 962778baf034deb0dd33fe7897828b2776b8d5de
+SHA1 (squid/squid-2.5.STABLE3-SENT_PASV.patch) = d2309e94fa8c0a3efa846df00ceda34c68df1c51
 SHA1 (squid/squid-2.5.STABLE3-deny_info.patch) = 665600974d6381d663bb6dbcd0d50967c1c40d36
+SHA1 (squid/squid-2.5.STABLE3-header_access_peer.patch) = 6434e62f93e9245c9e4f8e7c4404d381de066a84
+SHA1 (squid/squid-2.5.STABLE3-hostheader.patch) = ae2181cc549629abb543bbc08a35d3645f593468
+SHA1 (squid/squid-2.5.STABLE3-hostscomments.patch) = aa5cc8136e7c201d30a05958f4f0dde8807560ca
+SHA1 (squid/squid-2.5.STABLE3-http_reply_access-denied.patch) = 22d9cd846a4d9721470330e403567dee964e7713
+SHA1 (squid/squid-2.5.STABLE3-ie_refresh.patch) = 1b5c2fbeea08ae4b3e6c52acdac9a63da19f52fb
+SHA1 (squid/squid-2.5.STABLE3-memwarnsbrk.patch) = 4de86afdb84855173642ec99c4b610343283b639
+SHA1 (squid/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = 7d795418b8b322e0c04782feeae301c8fd734df4
+SHA1 (squid/squid-2.5.STABLE3-reply_body_max_size.patch) = 882a85bf0a9316fba249808ce436828db9dffccb
+SHA1 (squid/squid-2.5.STABLE3-tcp_reset_leak.patch) = c550bdfe5f049a0ff4285da1a4729a2441dd7237
 SHA1 (squid/squid-2.5.STABLE3.tar.gz) = 2705887ff07ea0e58dcd897ab2498655b78b35d6