diff --git a/.cvsignore b/.cvsignore
index d581886..3e62a4d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-squid-3.0.STABLE17.tar.bz2
-b9080.patch
-b9081.patch
-b9082.patch
+squid-3.0.STABLE18.tar.bz2
diff --git a/sources b/sources
index 8e4fdfe..664c453 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-68b4cdb2590f36e9475e7a8c1c4a4046  squid-3.0.STABLE17.tar.bz2
-b176387a9afcef85ef6467845c999f34  b9080.patch
-5948038b5629a9babd9f56ae1a25363e  b9081.patch
-345873eb1e301a6aa3e70ae8708d0c43  b9082.patch
+ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2
diff --git a/squid.spec b/squid.spec
index 631117c..2007a9f 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE17
-Release:  3%{?dist}
+Version:  3.0.STABLE18
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -22,9 +22,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9080.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9081.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9082.patch
 
 
 # External patches
@@ -63,9 +60,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9080
-%patch002 -p0 -b .b9081
-%patch003 -p0 -b .b9082
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -347,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Aug 04 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE18-1
+- Update to 3.0.STABLE18
+
 * Sat Aug 01 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE17-3
 - Squid Bug #2728: regression: assertion failed: http.cc:705: "!eof"