diff --git a/.cvsignore b/.cvsignore
index 36ac628..45f4d49 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,2 @@
-squid-3.1.0.16.tar.bz2
-squid-3.1.0.16.tar.bz2.asc
-squid-3.1-9881.patch
-squid-3.1-9882.patch
+squid-3.1.0.17.tar.bz2
+squid-3.1.0.17.tar.bz2.asc
diff --git a/sources b/sources
index 1fd4ad8..e0b4f10 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-e795d79cf37ec91f59d09c6804a2555b  squid-3.1.0.16.tar.bz2
-454d2e4205e1b3d4444b057fa417973b  squid-3.1.0.16.tar.bz2.asc
-3c6cc1e7feac49fed423d5fd56ac3fa4  squid-3.1-9881.patch
-e0e7cb7f286efcf9c027aec904674f55  squid-3.1-9882.patch
+5acabbc26f52363389703a8ce510c88d  squid-3.1.0.17.tar.bz2
+f70d58df04ffc2d92d89e90f8e62352b  squid-3.1.0.17.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index 8ee2205..929c3af 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.0.16
-Release:  7%{?dist}
+Version:  3.1.0.17
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2
@@ -21,8 +21,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9881.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9882.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -71,8 +70,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch001 -p0 -b .3.1-9881
-%patch002 -p0 -b .3.1-9882
+#patch001 -p0 -b .3.1-xxxx
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -264,6 +262,9 @@ fi
 
 
 %changelog
+* Thu Feb 25 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.17-1
+- Upgrade to 3.1.0.17
+
 * Thu Feb 18 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-7
 - Workaround for Fedora-13 build failure