diff --git a/.cvsignore b/.cvsignore
index 3685831..e9ac8c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-logwatch-5.1.tar.gz
+logwatch-5.2.2.tar.gz
diff --git a/logwatch.spec b/logwatch.spec
index 87957c0..af697e7 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
-Version: 5.1
-Release: 4
+Version: 5.2.2
+Release: 1
 Copyright: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -10,6 +10,8 @@ Patch: logwatch-4.3.2-nounicode.patch
 Patch1: logwatch-4.3.2-nosegfault.patch
 Patch3: logwatch-5.1-catchlocal.patch
 Patch4: logwatch-5.1-http400.patch
+Patch5: logwatch-5.2.2-126558-warn.patch
+Patch6: logwatch-2.6-101744-up2date.patch
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
 BuildArchitectures: noarch
@@ -28,6 +30,8 @@ analyzes Samba logs.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %install
 rm -rf %{buildroot}
@@ -37,9 +41,11 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/services
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/services
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/shared
 
-for i in autorpm cron samba up2date xferlog; do
-	install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/$i
-	install -m 0755 scripts/logfiles/$i/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/$i
+for i in scripts/logfiles/*; do
+    if [ $(ls $I | wc -l) -gt 0 ]; then
+	install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/$i
+	install -m 0755 $i/* %{buildroot}%{_sysconfdir}/log.d/$i
+    fi
 done
 
 install -m 0755 scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/scripts/logwatch.pl
@@ -86,11 +92,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/log.d/scripts/logfiles
 %dir %{_sysconfdir}/log.d/scripts/services
 %dir %{_sysconfdir}/log.d/scripts/shared
-%dir %{_sysconfdir}/log.d/scripts/logfiles/autorpm
-%dir %{_sysconfdir}/log.d/scripts/logfiles/cron
-%dir %{_sysconfdir}/log.d/scripts/logfiles/samba
-%dir %{_sysconfdir}/log.d/scripts/logfiles/up2date
-%dir %{_sysconfdir}/log.d/scripts/logfiles/xferlog
+%{_sysconfdir}/log.d/scripts/logfiles/*
 %config %{_sysconfdir}/log.d/conf/logwatch.conf
 %config %{_sysconfdir}/log.d/conf/services/*
 %config %{_sysconfdir}/log.d/conf/logfiles/*
@@ -98,11 +100,6 @@ rm -rf %{buildroot}
 %{_sbindir}/logwatch
 %{_sysconfdir}/log.d/scripts/shared/*
 %{_sysconfdir}/log.d/scripts/services/*
-%{_sysconfdir}/log.d/scripts/logfiles/autorpm/*
-%{_sysconfdir}/log.d/scripts/logfiles/cron/*
-%{_sysconfdir}/log.d/scripts/logfiles/samba/*
-%{_sysconfdir}/log.d/scripts/logfiles/up2date/*
-%{_sysconfdir}/log.d/scripts/logfiles/xferlog/*
 %{_sysconfdir}/log.d/logwatch
 %{_sysconfdir}/log.d/lib/Logwatch.pm
 %{_sysconfdir}/log.d/logwatch.conf
@@ -112,6 +109,16 @@ rm -rf %{buildroot}
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Wed Jul 14 2004 Elliot Lee <sopwith@redhat.com> 5.2.2-1
+- Update to 5.2.2
+- Patch for #126558, #101744
+
+* Wed Jul 07 2004 Elliot Lee <sopwith@redhat.com> 5.1-6
+- Extra patch from #80496
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Mon May 24 2004 Joe Orton <jorton@redhat.com> 5.1-4
 - stop logging access_log entries with 2xx response codes
 
diff --git a/sources b/sources
index c356d93..a00d74d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35f96e1002d081620c508216bb9a0170  logwatch-5.1.tar.gz
+d3b676fd15e51a00027ee13b4a5ce486  logwatch-5.2.2.tar.gz