diff --git a/.cvsignore b/.cvsignore
index 2c15dfc..2f5293f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,2 @@
-squid-3.1.3.tar.bz2
-squid-3.1.3.tar.bz2.asc
-squid-3.1-9967.patch
-squid-3.1-9968.patch
-squid-3.1-9969.patch
-squid-3.1-9970.patch
+squid-3.1.4.tar.bz2
+squid-3.1.4.tar.bz2.asc
diff --git a/sources b/sources
index 21a2c60..7b4833c 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,2 @@
-5b9ec56d38106826caf3888ab62bf865  squid-3.1.3.tar.bz2
-73ef4731b94ede53f82d7f149f96b329  squid-3.1.3.tar.bz2.asc
-0179f45a3ad39e44870cd573c3712280  squid-3.1-9967.patch
-1803005fc493a457bc544a0c9c4e06d7  squid-3.1-9968.patch
-b61bddb9fecd92b3d85ea553da0eb1c4  squid-3.1-9969.patch
-96b2df1dd9e5d127e9c74ff826e95cf3  squid-3.1-9970.patch
+3fb544ae02fadc2b4085f62bb927e861  squid-3.1.4.tar.bz2
+a4abc8a4710d6fc59478293125f027bc  squid-3.1.4.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index d0d3476..7fda1aa 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.3
-Release:  2%{?dist}
+Version:  3.1.4
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2
@@ -21,10 +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-9967.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9968.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9969.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9970.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,10 +68,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch001 -p0 -b .3.1-9967
-%patch002 -p0 -b .3.1-9968
-%patch003 -p0 -b .3.1-9969
-%patch004 -p0 -b .3.1-9970
+#patch001 -p0 -b .3.1-xxxx
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -265,6 +259,10 @@ fi
 
 
 %changelog
+* Sun May 30 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.4-1
+- Upstream 3.1.4 bugfix release, issues relating to IPv6, TPROXY, Memory
+  management, follow_x_forwarded_for, and stability fixes
+
 * Fri May 14 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.3-2
 - Fully fix #548903 - "comm_open: socket failure: (97) Address family not supported by protocol" if IPv6 disabled
 - Various IPv6 related issues fixed, making tcp_outgoing_address behave