diff --git a/www/squid/Makefile b/www/squid/Makefile
index 5f19d89050c..8a8ff79af6a 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,26 +1,16 @@
-# $OpenBSD: Makefile,v 1.33 2001/07/13 11:24:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.34 2001/07/20 14:37:38 brad Exp $
 
 COMMENT=	"WWW and FTP proxy cache and accelerator"
 
-DISTNAME=	squid-2.3.STABLE4
+DISTNAME=	squid-2.3.STABLE5
 PKGNAME=	squid-2.3
 CATEGORIES=	www
 NEED_VERSION=	1.413
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.3/ \
    		ftp://ftp.funet.fi/pub/mirrors/squid.nlanr.net/pub/squid-2/STABLE/
-MASTER_SITES0=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 EXTRACT_SUFX=	-src.tar.gz
 DIST_SUBDIR=	squid
 
-PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch:0 \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch:0 \
-		squid-2.3.stable4-ipfw_configure.patch:0 \
-		squid-2.3.stable4-invalid_ip_acl_entry.patch:0 \
-		squid-2.3.stable4-accel_only_access.patch:0 \
-		squid-2.3.stable4-html_quoting.patch:0 \
-		squid-2.3.stable4-carp-assertion.patch:0 \
-		squid-2.3.stable4-snmp-community-null-pointer.patch:0
-
 HOMEPAGE=	http://www.squid-cache.org/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index aa153418c1c..6fc94418554 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,27 +1,3 @@
-MD5 (squid/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
-MD5 (squid/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
-MD5 (squid/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
-MD5 (squid/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
-MD5 (squid/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
-MD5 (squid/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
-MD5 (squid/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
-MD5 (squid/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
-MD5 (squid/squid-2.3.stable4-snmp-community-null-pointer.patch) = 9f0cc927a440a289b8d515aec451303f
-RMD160 (squid/squid-2.3.STABLE4-src.tar.gz) = 0719f8e916b7f4cd011abcd17faf3ec68339c9b2
-RMD160 (squid/squid-2.3.stable4-accel_only_access.patch) = 81abb8b22d8f3dc2ed0538e335754e253ca489bc
-RMD160 (squid/squid-2.3.stable4-carp-assertion.patch) = 0e94d16275a2ceb8581d64448e664704527f7f35
-RMD160 (squid/squid-2.3.stable4-ftp_icon_not_found.patch) = 8e01afa8a06e54a2ac6f4ac28a3c79d03d69ffd7
-RMD160 (squid/squid-2.3.stable4-html_quoting.patch) = af531eff52fac881320d4c9bcec14912abbf9308
-RMD160 (squid/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = cd1522b16eabe046b80076eac8e89c992ca4ffd4
-RMD160 (squid/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 1447cb011f6e472e65e27690d7dfbe5589ecab59
-RMD160 (squid/squid-2.3.stable4-ipfw_configure.patch) = 3c895c9800d86a32cd73d192c1d97a76db8493ee
-RMD160 (squid/squid-2.3.stable4-snmp-community-null-pointer.patch) = 0c40408fb9f8d74adb60730d2fb93af9a35d461c
-SHA1 (squid/squid-2.3.STABLE4-src.tar.gz) = 69fba1c0c14ff7b40837ab6357eed706ad55b3ae
-SHA1 (squid/squid-2.3.stable4-accel_only_access.patch) = e6f6932e5e5c4a5dde462dcce221ee9fb0a2342d
-SHA1 (squid/squid-2.3.stable4-carp-assertion.patch) = 5d02606b3c65c07034fc8505e12802392656232a
-SHA1 (squid/squid-2.3.stable4-ftp_icon_not_found.patch) = 59fca251f4250d7a4580aeb40190abe144575285
-SHA1 (squid/squid-2.3.stable4-html_quoting.patch) = 5a1e21a212f784ef8bfb277f80e69819adcc7e84
-SHA1 (squid/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = 4403fe55cb75762c24701d45e1a36789cd7c84e5
-SHA1 (squid/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 8792fcad959176f62a20ff2b8892303e0026bf65
-SHA1 (squid/squid-2.3.stable4-ipfw_configure.patch) = fd5b0464723312c1e73f2b027ab3baa0220be6e9
-SHA1 (squid/squid-2.3.stable4-snmp-community-null-pointer.patch) = 1ee87cb442bf0540678740100934cfb60bdcea04
+MD5 (squid/squid-2.3.STABLE5-src.tar.gz) = 1a1ae6f496600f3af697692a5ad031f0
+RMD160 (squid/squid-2.3.STABLE5-src.tar.gz) = f7fdde83ff8371379465a9e6f827889bb3836317
+SHA1 (squid/squid-2.3.STABLE5-src.tar.gz) = 1d72129f9cfc36147c911b8058040877839b554a
diff --git a/www/squid/patches/patch-ah b/www/squid/patches/patch-ah
index 7919bfbec23..e97c81739ca 100644
--- a/www/squid/patches/patch-ah
+++ b/www/squid/patches/patch-ah
@@ -1,25 +1,14 @@
---- src/tools.c.orig	Fri Mar 24 15:55:31 2000
-+++ src/tools.c	Tue Jun 27 23:14:45 2000
-@@ -82,19 +82,15 @@
- mail_warranty(void)
- {
-     FILE *fp = NULL;
--    char *filename;
+--- src/tools.c.orig	Wed Jan  3 23:11:51 2001
++++ src/tools.c	Thu Jul 19 09:03:39 2001
+@@ -85,8 +85,9 @@
      static char command[256];
--    if ((filename = tempnam(NULL, appname)) == NULL)
--	return;
--    if ((fp = fopen(filename, "w")) == NULL)
+ #if HAVE_MKSTEMP
+     char filename[] = "/tmp/squid-XXXXXX";
+-    int tfd = mkstemp(filename);
+-    if (tfd < 0)
++    int tfd = -1;
 +
-+    snprintf(command, 256, "mail %s", Config.adminEmail);
-+    if ((fp = popen(command, "w")) == NULL)
++    if (mkstemp(filename) == -1)
+ 	return;
+     if ((fp = fdopen(tfd, "w")) == NULL)
  	return;
-     fprintf(fp, "From: %s\n", appname);
-     fprintf(fp, "To: %s\n", Config.adminEmail);
-     fprintf(fp, "Subject: %s\n", dead_msg());
-     fclose(fp);
--    snprintf(command, 256, "mail %s < %s", Config.adminEmail, filename);
--    system(command);		/* XXX should avoid system(3) */
--    unlink(filename);
- }
- 
- void