diff --git a/squid.spec b/squid.spec
index 3b96c0e..a34f5c3 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE9
-Release: 2
+Release: 4
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -33,6 +33,23 @@ Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ctyp
 Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-defer_digest_fetch.patch
 Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dup_content_length.patch
 Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-excess_data.patch
+Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs.patch
+Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-long_basic_auth.patch
+Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-CONNECT_truncated.patch
+Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-LDAP_SUN_SDK.patch
+Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-disable_hostname_checks.patch
+Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs_shutdown.patch
+Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-2GB.patch
+Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-rename_cleanup.patch
+Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-cachemgr_objects.patch
+Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-extaclauth.patch
+Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-syslog.patch
+Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-errpage_user.patch
+Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-debug_newlines.patch
+Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-transparent_port.patch
+Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-squid_k_nohostname.patch
+Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_CRLF.patch
+
 
 
 # Local patches
@@ -43,6 +60,7 @@ Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.5.STABLE7-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE5-pipe.patch
+Patch206: squid-2.5.STABLE9-libbind.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -79,12 +97,29 @@ lookup program (dnsserver), a program for retrieving FTP data
 %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
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .pipe
+%patch206 -p1 -b .libbind
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@@ -304,6 +339,11 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Fri Apr 22 2005 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE9-4
+- More upstream patches, including the fixed 2GB patch.
+- include the -libbind patch, which prevents squid from using the optional
+  -lbind library, even if it's installed.
+
 * Tue Mar 15 2005 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE9-2
 - New upstream version, with 14 upstream patches.