diff --git a/logwatch.spec b/logwatch.spec
index 8f1b9ca..4e5e80a 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 2.6
-Release: 2
+Release: 7
 Copyright: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -9,6 +9,11 @@ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-2.6.tar.gz
 Patch: logwatch-2.6-mktemp.patch
 Patch1: logwatch-2.6-newline-62787.patch
 Patch2: logwatch-2.6-applystddate-63279.patch
+Patch3: logwatch-2.6-applydate-65655.patch
+Patch4: logwatch-2.6-xinetd_match-65856.patch
+Patch5: logwatch-2.6-confparse-65937.patch
+Patch6: ftpd-messages.patch
+Patch7: logwatch-2.6-norepeats-68869.patch
 Requires: perl,textutils,sh-utils,grep,mailx
 BuildRoot: %{_tmppath}/logwatch-build
 BuildArchitectures: noarch
@@ -26,6 +31,12 @@ analyzes Samba logs.
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch7 -p1
+cd scripts/services
+%patch6 -p0
 
 %install
 rm -rf %{buildroot}
@@ -40,6 +51,9 @@ install -m 0755 scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/scripts/log
 install -m 0755 scripts/logfiles/xferlog/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/xferlog
 install -m 0755 scripts/logfiles/samba/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/samba
 install -m 0755 scripts/services/* %{buildroot}%{_sysconfdir}/log.d/scripts/services
+
+# expandrepeats broken, bug #67606
+rm -f scripts/shared/expandrepeats
 install -m 0755 scripts/shared/* %{buildroot}%{_sysconfdir}/log.d/scripts/shared
 
 install -m 0644 conf/logwatch.conf %{buildroot}%{_sysconfdir}/log.d/conf/logwatch.conf
@@ -97,6 +111,25 @@ rm -rf %{buildroot}
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Jul 15 2002 Elliot Lee <sopwith@redhat.com> 2.6-7
+- Fix #68869 (the other half of the expandrepeats job)
+
+* Thu Jul 11 2002 Elliot Lee <sopwith@redhat.com> 2.6-6
+- Remove expandrepeats (#67606)
+- Patch6 (ftpd-messages.patch) from #68243
+
+* Thu Jun 27 2002 Elliot Lee <sopwith@redhat.com> 2.6-5
+- logwatch-2.6-applydate-65655.patch to fix xferlog date parsing
+- logwatch-2.6-xinetd_match-65856.patch to match more xinetd lines properly
+- logwatch-2.6-confparse-65937.patch to properly parse lines with multiple 
+  = chars in them
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
 * Mon Apr 15 2002 Elliot Lee <sopwith@redhat.com> 2.6-2
 - Fix #62787 (logwatch-2.6-newline-62787.patch) and #63279 (logwatch-2.6-applystddate-63279.patch)