diff --git a/squid.spec-3.1 b/squid.spec-3.1
index c9dae46..0b7a3dd 100644
--- a/squid.spec-3.1
+++ b/squid.spec-3.1
@@ -2,13 +2,6 @@
 %define __perl_requires %{SOURCE98}
 ## % define __find_requires %{SOURCE99}
 
-# TODO:
-# - Still several patches to rebase. Is all really needed? Some should
-#   be possible to override with buildtime variables
-# - Error pages have changed. Squid now to language negotiation
-# - Should helpers be split in their own packages? Starting to have a fair
-#   bit of dependencies there
-
 Name:     squid
 Version:  3.1.0.13
 Release:  1%{?dist}
@@ -86,7 +79,7 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
-   --with-logdir='$(localstatedir)/logs' \
+   --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
@@ -342,22 +335,41 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Wed Jul 01 2009 Jiri Skala <jskala@redhat.com> 3.0.STABLE16-2
+* Mon Aug 31 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.0.STABLE18-3
+- Bug #520445 silence logrotate when Squid is not running
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 7:3.0.STABLE18-2
+- rebuilt with new openssl
+
+* 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"
+
+* Mon Jul 27 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE17-2
+- Bug #514014, update to 3.0.STABLE17 fixing the denial of service issues
+  mentioned in Squid security advisory SQUID-2009_2.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7:3.0.STABLE16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 01 2009 Jiri Skala <jskala@redhat.com> 7:3.0.STABLE16-2
 - fixed patch parameter of bXXX patches
 
-* Mon Jun 29 2009 Henrik Nordstrom <henrik@henriknordstrom.net> 3.0.STABLE16-1
+* Mon Jun 29 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE16-1
 - Upgrade to 3.0.STABLE16
 
-* Sat May 23 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.0.STABLE15-2
+* Sat May 23 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE15-2
 - Bug #453304 - Squid requires restart after Network Manager connection setup
 
-* Sat May 09 2009 Henrik Nordstrom <henrik@henriknordstrom.net> 3.0.STABLE15-1
+* Sat May 09 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE15-1
 - Upgrade to 3.0.STABLE15
 
-* Tue Apr 28 2009 Jiri Skala <jskala@redhat.com> - 3.0.STABLE14-3
+* Tue Apr 28 2009 Jiri Skala <jskala@redhat.com> - 7:3.0.STABLE14-3
 - fixed ambiguous condition in the init script (exit 4)
 
-* Mon Apr 20 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.0.STABLE14-2
+* Mon Apr 20 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"
 
 * Sun Apr 19 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE14-1