Index: BOOK/bootscripts/alpha-chapter.xml
===================================================================
--- BOOK/bootscripts/alpha-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/alpha-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: OK/bootscripts/common/sysklogd.xml
===================================================================
--- BOOK/bootscripts/common/sysklogd.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-sysklogd">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Configuring the sysklogd script</title>
-
-  <indexterm zone="ch-scripts-sysklogd">
-    <primary sortas="d-sysklogd">sysklogd</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>The <filename>sysklogd</filename> script invokes the
-  <command>syslogd</command> program with the <option>-m 0</option> option.
-  This option turns off the periodic timestamp mark that
-  <command>syslogd</command> writes to the log files every 20 minutes by
-  default. If you want to turn on this periodic timestamp mark, edit the
-  <filename>sysklogd</filename> script and make the changes accordingly.
-  See <userinput>man syslogd</userinput> for more information.</para>
-
-</sect1>
Index: BOOK/bootscripts/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/mips-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/mips64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/mips64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/native-chapter.xml
===================================================================
--- BOOK/bootscripts/native-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/native-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/native64-chapter.xml
===================================================================
--- BOOK/bootscripts/native64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/native64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/ppc-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/ppc64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/sparc-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/sparc64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/sparc64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/x86-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/x86_64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/bootscripts/x86_64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -18,5 +18,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/alpha-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/common/rsyslog.xml
===================================================================
--- BOOK/final-system/common/rsyslog.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
+++ BOOK/final-system/common/rsyslog.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
+  <?dbhtml filename="rsyslog.html"?>
+
+  <title>Rsyslog-&rsyslog-version;</title>
+
+  <indexterm zone="ch-system-rsyslog">
+    <primary sortas="a-rsyslog">rsyslog</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The rsyslog package contains programs for logging system messages,
+    such as those given by the kernel when unusual things happen.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rsyslog</title>
+
+    <para os="a">Prepare Rsyslog for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --sbindir=/sbin</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-rsyslog" role="configuration">
+    <title>Configuring rsyslog</title>
+
+    <indexterm zone="conf-rsyslog">
+      <primary sortas="a-rsyslog">rsyslog</primary>
+    <secondary>configuring</secondary></indexterm>
+
+    <indexterm zone="conf-rsyslog">
+      <primary sortas="e-/etc/rsyslog.conf">/etc/rsyslog.conf</primary>
+    </indexterm>
+
+    <para>Create a new <filename>/etc/rsyslog.conf</filename> file by running
+    the following:</para>
+
+<screen><userinput>cat &gt; /etc/rsyslog.conf &lt;&lt; "EOF"
+<literal># Begin /etc/rsyslog.conf
+
+# CLFS configuration of rsyslog. For more info use man rsyslog.conf
+
+#######################################################################
+# Rsyslog Modules
+
+# Support for Local System Logging
+$ModLoad imuxsock.so
+
+# Support for Kernel Logging
+$ModLoad imklog.so
+
+#######################################################################
+# Global Options
+
+# Use traditional timestamp format.
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# Set the default permissions for all log files.
+$FileOwner root
+$FileGroup root
+$FileCreateMode 0640
+$DirCreateMode 0755
+
+#######################################################################
+# Standard Log Files
+
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+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
+
+# Catch All Logs
+*.=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
+
+# Emergency are shown to everyone
+*.emerg				*
+
+# End /etc/rsyslog.conf</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-rsyslog" role="content">
+    <title>Contents of rsyslog</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>rsyslogd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rsyslogd">
+        <term><command>rsyslogd</command></term>
+        <listitem>
+          <para>Logs the messages that system programs offer for logging.
+          Every logged message contains at least a date stamp and a hostname,
+          and normally the program's name too, but that depends on how
+          trusting the logging daemon is told to be.</para>
+          <indexterm zone="ch-system-rsyslog rsyslogd">
+            <primary sortas="b-rsyslogd">syslogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/common/sysklogd.xml
===================================================================
--- BOOK/final-system/common/sysklogd.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Sysklogd-&sysklogd-version;</title>
-
-  <indexterm zone="ch-system-sysklogd">
-    <primary sortas="a-Sysklogd">Sysklogd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sysklogd package contains programs for logging system messages,
-    such as those given by the kernel when unusual things happen.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysklogd</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-sysklogd" role="configuration">
-    <title>Configuring Sysklogd</title>
-
-    <indexterm zone="conf-sysklogd">
-      <primary sortas="a-Sysklogd">Sysklogd</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-sysklogd">
-      <primary sortas="e-/etc/syslog.conf">/etc/syslog.conf</primary>
-    </indexterm>
-
-    <para>Create a new <filename>/etc/syslog.conf</filename> file by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"
-<literal># Begin /etc/syslog.conf
-
-auth,authpriv.*                                 -/var/log/auth.log
-*.*;auth,authpriv.none                          -/var/log/sys.log
-daemon.*                                        -/var/log/daemon.log
-kern.*                                          -/var/log/kern.log
-mail.*                                          -/var/log/mail.log
-user.*                                          -/var/log/user.log
-*.info;mail.none;authpriv.none;cron.none        -/var/log/messages
-*.emerg                                         *
-
-# log the bootscript output:
-local2.*                                        -/var/log/boot.log
-
-# End /etc/syslog.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-sysklogd" role="content">
-    <title>Contents of Sysklogd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>klogd and syslogd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="klogd">
-        <term><command>klogd</command></term>
-        <listitem>
-          <para>A system daemon for intercepting and logging kernel
-          messages</para>
-          <indexterm zone="ch-system-sysklogd klogd">
-            <primary sortas="b-klogd">klogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="syslogd">
-        <term><command>syslogd</command></term>
-        <listitem>
-          <para>Logs the messages that system programs offer for logging.
-          Every logged message contains at least a date stamp and a hostname,
-          and normally the program's name too, but that depends on how
-          trusting the logging daemon is told to be.</para>
-          <indexterm zone="ch-system-sysklogd syslogd">
-            <primary sortas="b-syslogd">syslogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/mips-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/mips64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -93,5 +93,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
Index: BOOK/final-system/multilib/rsyslog.xml
===================================================================
--- BOOK/final-system/multilib/rsyslog.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
+++ BOOK/final-system/multilib/rsyslog.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
+  <?dbhtml filename="rsyslog.html"?>
+
+  <title>rsyslog-&rsyslog-version;</title>
+
+  <indexterm zone="ch-system-rsyslog">
+    <primary sortas="a-rsyslog">rsyslog</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of rsyslog</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('conf-rsyslog'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('contents-rsyslog'))"/>
+
+</sect1>
Index: OK/final-system/multilib/sysklogd.xml
===================================================================
--- BOOK/final-system/multilib/sysklogd.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Sysklogd-&sysklogd-version;</title>
-
-  <indexterm zone="ch-system-sysklogd">
-    <primary sortas="a-Sysklogd">Sysklogd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysklogd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(id('conf-sysklogd'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(id('contents-sysklogd'))"/>
-
-</sect1>
Index: BOOK/final-system/native-chapter.xml
===================================================================
--- BOOK/final-system/native-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/native-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/native64-chapter.xml
===================================================================
--- BOOK/final-system/native64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/native64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -77,5 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/ppc-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -77,5 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/sparc-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -77,5 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/x86-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -77,5 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/introduction/common/changelog.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -36,4 +36,19 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>January 31, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jim] - Updated Bootscripts to 1.2-pre4.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Removed Sysklogd.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Added Rsyslog 3.20.3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/materials/common/packages.xml	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -430,4 +430,13 @@
 
     <varlistentry>
+      <term>Rsyslog (&rsyslog-version;) - <token>&rsyslog-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&rsyslog-home;"/></para>
+        <para>Download: <ulink url="&rsyslog-url;"/></para>
+        <para>MD5 sum: <literal>&rsyslog-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
@@ -448,13 +457,4 @@
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sysklogd-home;"/></para>
-        <para>Download: <ulink url="&sysklogd-url;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 7be26ca580174caacaf824653d6bbe678eade9c7)
+++ BOOK/packages.ent	(revision 37de9d19aa66b8c1a84871d021a124599f6ebaee)
@@ -67,8 +67,8 @@
 <!ENTITY bzip2-home "http://www.bzip.org/">
 
-<!ENTITY clfs-bootscripts-version "1.2-pre3">
+<!ENTITY clfs-bootscripts-version "1.2-pre4">
 <!ENTITY clfs-bootscripts-size "40 KB">
 <!ENTITY clfs-bootscripts-url "&packages-root;bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "b02b13426d55d306c3cf9da75be790aa">
+<!ENTITY clfs-bootscripts-md5 "fc260bd1197a083ac2f6164bf61d978f">
 <!ENTITY clfs-bootscripts-home " ">
 
@@ -357,4 +357,10 @@
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 
+<!ENTITY rsyslog-version "3.20.3">
+<!ENTITY rsyslog-size "1,272 KB">
+<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
+<!ENTITY rsyslog-md5 "38d66dd8c70e8429962f4a4da218fe7c">
+<!ENTITY rsyslog-home "http://www.rsyslog.com/">
+
 <!ENTITY sed-version "4.1.5">
 <!ENTITY sed-size "781 KB">
@@ -374,10 +380,4 @@
 <!ENTITY silo-md5 "168182dfa0025914ceecac9591a6674c">
 <!ENTITY silo-home "">
-
-<!ENTITY sysklogd-version "1.5">
-<!ENTITY sysklogd-size "86 KB">
-<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
-<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd">
 
 <!ENTITY sysvinit-version "2.86">
