diff --git a/scripts/latecommand/rsyslog/99syslog.conf b/scripts/latecommand/rsyslog/99syslog.conf
index 6267bb0..05425a8 100644
--- a/scripts/latecommand/rsyslog/99syslog.conf
+++ b/scripts/latecommand/rsyslog/99syslog.conf
@@ -4,25 +4,55 @@
 #----------------------------------------------------------------------------
 # Fichier de configuration du daemon syslogd
 #----------------------------------------------------------------------------
-kern.*              /var/log/kernel/kernel.log
-user.*              /var/log/security/user.log
-mail.*              /var/log/mail/mail.log
-daemon.*            /var/log/syslog/daemon.log
-auth.*              /var/log/security/auth.log
-lpr.*               /var/log/lpr/lpr.log
-news.*              /var/log/news/news.log
-uucp.*              /var/log/syslog/uucp.log
-cron.*              /var/log/cron/cron.log
-mark.*              /var/log/cron/mark.log
-local0.*            /var/log/syslog/local0.log
-local1.*            /var/log/syslog/local1.log
-local2.*            /var/log/syslog/local2.log
-local3.*            /var/log/syslog/local3.log
-local4.*            /var/log/syslog/local4.log
-local5.*            /var/log/syslog/local5.log
-local6.*            /var/log/syslog/local6.log
-local7.*            /var/log/syslog/local7.log
-syslog.*            /var/log/syslog/syslog.log
-authpriv.*          /var/log/security/authpriv.log
-*.=info;*.=notice   /var/log/messages/messages
 
+#
+# First some standard log files.  Log by facility.
+#
+auth.*                    /var/log/auth.log
+authpriv.*                /var/log/authpriv.log
+*.*;auth,authpriv.none    -/var/log/syslog
+cron.*                    /var/log/cron.log
+mark.*                    /var/log/cron/mark.log
+daemon.*                  -/var/log/daemon.log
+kern.*                    -/var/log/kern.log
+lpr.*                     -/var/log/lpr.log
+mail.*                    -/var/log/mail.log
+user.*                    -/var/log/user.log
+
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info      -/var/log/mail.info
+mail.warn      -/var/log/mail.warn
+mail.err       /var/log/mail.err
+
+#
+# Additional log may be used occasionally
+#
+news.*              /var/log/news.log
+uucp.*              /var/log/uucp.log
+local0.*            /var/log/local0.log
+local1.*            /var/log/local1.log
+local2.*            /var/log/local2.log
+local3.*            /var/log/local3.log
+local4.*            /var/log/local4.log
+local5.*            /var/log/local5.log
+local6.*            /var/log/local6.log
+local7.*            /var/log/local7.log
+
+#
+# Some "catch-all" log files.
+#
+*.=debug;\
+	auth,authpriv.none;\
+	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warn;\
+	auth,authpriv.none;\
+	cron,daemon.none;\
+	mail,news.none		-/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg				:omusrmsg:*