diff --git a/squid.spec b/squid.spec
index de121d4..d535f4d 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE5
-Release: 4.fc2
+Release: 5
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -23,8 +23,6 @@ Patch3: squid-2.5.STABLE4-location.patch
 Patch4: squid-2.5.STABLE3-build.patch
 Patch5: squid-2.5.STABLE4-perlpath.patch
 Patch6: squid-2.5.STABLE5-pipe.patch
-Patch7: squid-2.5.STABLE5-warning.patch
-Patch8: squid-2.5.STABLE3-libntlmssp.patch
 
 Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_assert.patch
 Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ldap.patch
@@ -37,6 +35,31 @@ Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-deny
 Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_timeout.patch
 Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cache_swap_log.patch
 
+Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_warning.patch
+Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-rfc1035NameUnpack.patch
+Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-digest_blank.patch
+Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-post_assert.patch
+Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-spelling.patch
+Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-digest_ERR.patch
+Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch
+Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-vary_negatively.patch
+Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-range_offset_limit.patch
+Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-large_cache_mem.patch
+
+Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-least-load.patch
+Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch
+Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-debug_client_ip.patch
+Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-openbsd_m88k.patch
+Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ftp_html_doctype.patch
+Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-dns_localhost.patch
+Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-msnt_auth_doc.patch
+Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-va_copy.patch
+Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_log_size.patch
+Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-proxy_abuse.patch
+
+Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-sasl_auth_SASL2.patch
+Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_auth_overflow.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
@@ -63,8 +86,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch4 -p1 -b .build
 %patch5 -p1 -b .perlpath
 %patch6 -p1 -b .pipe
-%patch7 -p1 -b .warning
-%patch8 -p1 -b .libntlmssp
+
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -76,6 +98,31 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch108 -p1
 %patch109 -p1
 
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
+%patch117 -p1
+%patch118 -p1
+%patch119 -p1
+
+%patch120 -p1
+%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
+%patch125 -p1
+%patch126 -p1
+%patch127 -p1
+%patch128 -p1
+%patch129 -p1
+
+%patch130 -p1
+%patch131 -p1
+
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; 
 %configure \
@@ -291,12 +338,13 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %changelog
-* Mon Jun 7 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE3-4.fc2
-- Backport security fix for ntlm auth helper.
-
-* Thu Apr 8 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE5-3
+* Mon Jun 28 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5STABLE5-5
+- Merge current upstream patches.
 - Fix the -pipe patch to have the correct name of the winbind pipe.
 
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Mon Apr 5 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE5-2
 - Include the first 10 upstream patches
 - Add a patch for the correct location of the winbindd pipe.  This closes