diff --git a/.cvsignore b/.cvsignore
index bb3cf4a..cdf4684 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ squid-2.5.STABLE12.tar.bz2
 squid-2.5.STABLE13.tar.bz2
 squid-2.5.STABLE14.tar.bz2
 squid-2.6.STABLE3.tar.bz2
+squid-2.6.STABLE4.tar.bz2
diff --git a/sources b/sources
index 6583f2e..949702b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b181e9c08f35d098e53e54b01fbd092  squid-2.6.STABLE3.tar.bz2
+81ed6ff977dff6d76b0ad2b5390ebf89  squid-2.6.STABLE4.tar.bz2
diff --git a/squid.spec b/squid.spec
index cbe586a..2f715bf 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.6.STABLE3
-Release: 2%{?dist}
+Version: 2.6.STABLE4
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,10 +19,15 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch101: squid-2.6.STABLE3-italian.patch
-Patch102: squid-2.6.STABLE3-acl-ports.patch
-Patch103: squid-2.6.STABLE3-acl-time.patch
-Patch104: squid-2.6.STABLE3-acl-time-2.patch
+Patch101: squid-2.6.STABLE4-compile.patch
+Patch102: squid-2.6.STABLE4-coss.patch
+Patch103: squid-2.6.STABLE4-coss-gcc.patch
+Patch104: squid-2.6.STABLE4-syslog.patch
+Patch105: squid-2.6.STABLE4-cache-peer.patch
+Patch106: squid-2.6.STABLE4-mem-leak.patch
+Patch107: squid-2.6.STABLE4-forward.patch
+Patch108: squid-2.6.STABLE4-snmp.patch
+Patch109: squid-2.6.STABLE4-mem-leak-ncsa.patch
 
 # External patches
 
@@ -63,6 +68,11 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -333,6 +343,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Oct 2 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE4-1
+- new upstream
+- fixes from upstream bugzilla, items #1782,#1780,#1785,#1719,#1784,#1776
+
 * Tue Sep 5 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE3-2
 - added upstream patches for ACL