diff --git a/.cvsignore b/.cvsignore
index 3b605d3..b858830 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,8 @@ b9694.patch
 b9696.patch
 b9704.patch
 b9707.patch
+b9719.patch
+b9720.patch
+squid-3.1-9737.patch
+squid-3.1-9743.patch
+squid-3-10002.patch
diff --git a/sources b/sources
index bb6e971..a5b1fe1 100644
--- a/sources
+++ b/sources
@@ -4,3 +4,8 @@ c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch
 e7a8c54548fa45519d8c9d7a885a821a  b9696.patch
 bf71774b13a1506d9a1dffd2cd6daf34  b9704.patch
 a31a23ec33542a9ed2c486ee44c60550  b9707.patch
+1665438b177324cf666562a36d9234f4  b9719.patch
+307067bdf851610c1c663067948fb5dc  b9720.patch
+b6603141eeef4d119aa52dfc7e694538  squid-3.1-9737.patch
+0376008be9d4de6da28907484ac4eaee  squid-3.1-9743.patch
+a83ca39085d085ed5a79fe4553b87a66  squid-3-10002.patch
diff --git a/squid.spec b/squid.spec
index 03593bb..b779f68 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  6%{?dist}
+Release:  7%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -26,13 +26,11 @@ Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
 Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
 Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
 Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
-# Upstream fix, but have not reached 3.1 yet
-Patch005: squid-3.1.0.13-alias-link.patch
-
-# External patches
-# Submitted upstream on squid-dev by Markus Moeller <huaraz@moeller.plus.com>
-Patch101: squid_kerb_auth-configure.in.patch
-
+Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9719.patch
+Patch006: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9720.patch
+Patch007: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9737.patch
+Patch008: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9743.patch
+Patch009: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10002.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -49,7 +47,7 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel
+BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel db4-devel expat-devel
 Obsoletes: squid-novm
 
 %description
@@ -71,8 +69,11 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch002 -p0 -b .b9696
 %patch003 -p0 -b .b9704
 %patch004 -p0 -b .b9707
-%patch005 -p0 -b .alias-link
-%patch101 -p1 -b .kerb_auth_configure
+%patch005 -p0 -b .b9719
+%patch006 -p0 -b .b9720
+%patch007 -p0 -b .3.1-9737
+%patch008 -p0 -b .3.1-9743
+%patch009 -p0 -b .3-10002
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
@@ -115,6 +116,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --enable-storeio="aufs,diskd,ufs" \
    --enable-useragent-log \
    --enable-wccpv2 \
+   --enable-esi \
    --with-aio \
    --with-default-user="squid" \
    --with-filedescriptors=16384 \
@@ -166,6 +168,10 @@ chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# Move the MIB definition to the proper place (and name)
+mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
+mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
+
 # squid.conf.documented is documentation. We ship that in doc/
 rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
 
@@ -207,12 +213,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
-%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
 %{_bindir}/squidclient
 %{_mandir}/man8/*
 %{_mandir}/man1/*
 %{_libdir}/squid/*
+/usr/share/snmp/mibs/SQUID-MIB.txt
 
 %pre
 if ! getent group squid >/dev/null 2>&1; then
@@ -253,6 +259,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Sep 26 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.13-7
+- Include upstream patches fixing important operational issues
+- Enable ESI support now that it does not conflict with normal operation
+
 * Fri Sep 18 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.13-6
 - Rotate store.log if enabled