diff -Naur logwatch-5.2.2-org/conf/logfiles/exim.conf logwatch-5.2.2/conf/logfiles/exim.conf
--- logwatch-5.2.2-org/conf/logfiles/exim.conf	2003-12-15 19:35:01.000000000 +0100
+++ logwatch-5.2.2/conf/logfiles/exim.conf	2004-09-22 16:19:49.272761662 +0200
@@ -13,9 +13,13 @@
 # No  = False = Off = 0
 
 # Which logfile group...
+LogFile = /var/log/mail
+LogFile = /var/log/maillog
 LogFile = /var/log/exim/main.log
 Archive = /var/log/exim/main.log.*
+Archive = /var/log/mail.*
 Archive = /var/log/archiv/exim/main.log.*
+Archive = /var/log/maillog.*
 
 ########################################################
 # This was written and is maintained by:
diff -Naur logwatch-5.2.2-org/conf/logfiles/http.conf logwatch-5.2.2/conf/logfiles/http.conf
--- logwatch-5.2.2-org/conf/logfiles/http.conf	2004-06-21 16:59:03.000000000 +0200
+++ logwatch-5.2.2/conf/logfiles/http.conf	2004-09-22 16:20:07.840386631 +0200
@@ -10,10 +10,10 @@
 # (optionally containing wildcards) that tell where they are...
 # Note: if these are gzipped, you need to end with a .gz even if
 #       you use wildcards...
-Archive = archiv/httpd/access_log.*
-Archive = archiv/httpd/*access_log.*
-Archive = archiv/httpd/access_log.*.gz
-Archive = archiv/httpd/*access_log.*.gz
+Archive = httpd/access_log.*
+Archive = httpd/*access_log.*
+Archive = httpd/access_log.*.gz
+Archive = httpd/*access_log.*.gz
 
 # Expand the repeats (actually just removes them now)
 *ExpandRepeats
diff -Naur logwatch-5.2.2-org/conf/logfiles/maillog.conf logwatch-5.2.2/conf/logfiles/maillog.conf
--- logwatch-5.2.2-org/conf/logfiles/maillog.conf	2003-12-15 19:35:01.000000000 +0100
+++ logwatch-5.2.2/conf/logfiles/maillog.conf	2004-09-22 16:20:30.699231627 +0200
@@ -11,12 +11,15 @@
 ########################################################
 
 # What actual file?  Defaults to LogPath if not absolute path....
+LogFile = mail
 LogFile = maillog
 
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 # Note: if these are gzipped, you need to end with a .gz even if
 #       you use wildcards...
+Archive = mail.*
+Archive = maillog.*
 Archive = archiv/maillog.*
 Archive = archiv/maillog.*.gz
 
diff -Naur logwatch-5.2.2-org/conf/logfiles/secure.conf logwatch-5.2.2/conf/logfiles/secure.conf
--- logwatch-5.2.2-org/conf/logfiles/secure.conf	2003-12-15 19:35:01.000000000 +0100
+++ logwatch-5.2.2/conf/logfiles/secure.conf	2004-09-22 16:21:23.838572775 +0200
@@ -12,12 +12,15 @@
 
 # What actual file?  Defaults to LogPath if not absolute path....
 LogFile = secure
+LogFile = auth
 LogFile = authlog
 
 # If the archives are searched, here is one or more line
 # (optionally containing wildcards) that tell where they are...
 # Note: if these are gzipped, you need to end with a .gz even if
 #       you use wildcards...
+Archive = auth.*
+Archive = authlog.*
 Archive = secure.*
 Archive = secure.*.gz
 Archive = archiv/secure.*
diff -Naur logwatch-5.2.2-org/conf/logwatch.conf logwatch-5.2.2/conf/logwatch.conf
--- logwatch-5.2.2-org/conf/logwatch.conf	2004-06-21 16:24:31.000000000 +0200
+++ logwatch-5.2.2/conf/logwatch.conf	2004-09-22 16:15:48.769480683 +0200
@@ -98,7 +98,7 @@
 #
 # some systems have different locations for mailers
 #
-mailer = /bin/mail
+mailer = /usr/bin/mail
 
 #
 # With this option set to 'Yes', only log entries for this particular host
diff -Naur logwatch-5.2.2-org/scripts/services/zz-disk_space logwatch-5.2.2/scripts/services/zz-disk_space
--- logwatch-5.2.2-org/scripts/services/zz-disk_space	2004-06-21 16:18:55.000000000 +0200
+++ logwatch-5.2.2/scripts/services/zz-disk_space	2004-09-22 16:31:07.326530675 +0200
@@ -17,7 +17,7 @@
    echo
    echo "------------------ Disk Space --------------------"
    echo
-   df -h | grep '^/dev/'
+   df -hP | grep '^/dev/'
    echo
 elif [ "$PRINTING" = "y" ] ; then
    echo