Index: general.ent
===================================================================
--- general.ent	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ general.ent	(revision 58f0b911d19bed7f6c312b37f3de24c2937ccb20)
@@ -67,5 +67,5 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20120828">
+<!ENTITY blfs-bootscripts-version     "20130125">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
@@ -344,5 +344,5 @@
 <!ENTITY rxvt-unicode-version         "9.15">
 <!ENTITY screen-version               "4.0.3">
-<!ENTITY sharutils-version            "4.11.1">
+<!ENTITY sharutils-version            "4.13.3">
 <!ENTITY spidermonkey-version         "1.0.0">
 <!ENTITY tidy-version                 "cvs_20101110">
@@ -456,5 +456,5 @@
 <!ENTITY ppp-version                  "2.4.5">
 <!ENTITY dhcpcd-version               "5.6.2">
-<!ENTITY dhcp-version                 "4.2.4-P2">
+<!ENTITY dhcp-version                 "4.2.5">
 
 <!-- Chapter 15 -->
@@ -520,5 +520,5 @@
 <!-- Chapter 21 -->
 <!ENTITY exim-version                 "4.80.1">
-<!ENTITY postfix-version              "2.9.4">
+<!ENTITY postfix-version              "2.9.5">
 <!ENTITY qpopper-version              "4.1.0">
 <!ENTITY sendmail-version             "8.14.5">
Index: general/genutils/sharutils.xml
===================================================================
--- general/genutils/sharutils.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ general/genutils/sharutils.xml	(revision 58f0b911d19bed7f6c312b37f3de24c2937ccb20)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY sharutils-download-http "http://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.bz2">
-  <!ENTITY sharutils-download-ftp "ftp://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.bz2">
-  <!ENTITY sharutils-md5sum "52dd02b6f5e0a148ba871234ae29bba2">
-  <!ENTITY sharutils-size "984 KB">
-  <!ENTITY sharutils-buildsize "10 MB">
-  <!ENTITY sharutils-time "0.3 SBU">
+  <!ENTITY sharutils-download-http "http://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
+  <!ENTITY sharutils-download-ftp  "ftp://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
+  <!ENTITY sharutils-md5sum        "ac996dbe2dfc74647b500506af56779b">
+  <!ENTITY sharutils-size          "940 KB">
+  <!ENTITY sharutils-buildsize     "18 MB">
+  <!ENTITY sharutils-time          "0.3 SBU">
 ]>
 
-<sect1 id="sharutils" xreflabel="sharutils-&sharutils-version;">
+<sect1 id="sharutils" xreflabel="Sharutils-&sharutils-version;">
   <?dbhtml filename="sharutils.html"?>
 
@@ -21,15 +21,17 @@
   </sect1info>
 
-  <title>sharutils-&sharutils-version;</title>
+  <title>Sharutils-&sharutils-version;</title>
 
   <indexterm zone="sharutils">
-    <primary sortas="a-sharutils">sharutils</primary>
+    <primary sortas="a-Sharutils">Sharutils</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to sharutils</title>
+    <title>Introduction to Sharutils</title>
 
-    <para>The <application>sharutils</application> package contains
-    utilities that can create 'shell' archives.</para>
+    <para>
+      The <application>Sharutils</application> package contains
+      utilities that can create 'shell' archives.
+    </para>
 
     &lfs72_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sharutils-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&sharutils-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&sharutils-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&sharutils-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &sharutils-md5sum;</para>
+        <para>
+          Download MD5 sum: &sharutils-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &sharutils-size;</para>
+        <para>
+          Download size: &sharutils-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &sharutils-buildsize;</para>
+        <para>
+          Estimated disk space required: &sharutils-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &sharutils-time;</para>
+        <para>
+          Estimated build time: &sharutils-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -63,29 +77,25 @@
 
   <sect2 role="installation">
-    <title>Installation of sharutils</title>
+    <title>Installation of Sharutils</title>
 
-    <para>First fix an obsolete definition in the included gnulib:</para>
-
-<screen><userinput>sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
-
-    <para>Now, install <application>sharutils</application> by running the following commands:</para>
+    <para>
+      Install <application>Sharutils</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>To test <application>sharutils</application>, run 
-    <userinput>make check</userinput>.</para>
+    <para>
+      To test the results, issue <command>make check</command>.
+    </para>
 
-    <para>As the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-
-  <!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-  </sect2>-->
 
   <sect2 role="content">
@@ -98,7 +108,13 @@
 
       <seglistitem>
-        <seg>shar, unshar, uudecode, and uuencode</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>
+          shar, unshar, uudecode and uuencode
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -112,6 +128,8 @@
         <term><command>shar</command></term>
         <listitem>
-          <para>creates "shell archives" (or shar files) which are in 
-          text format and can be mailed.</para>
+          <para>
+            creates "shell archives" (or shar files) which are in 
+            text format and can be mailed.
+          </para>
           <indexterm zone="sharutils shar">
             <primary sortas="b-shar">shar</primary>
@@ -123,5 +141,7 @@
         <term><command>unshar</command></term>
         <listitem>
-          <para>unpacks a shar file.</para>
+          <para>
+            unpacks a shar file.
+          </para>
           <indexterm zone="sharutils unshar">
             <primary sortas="b-unshar">unshar</primary>
@@ -133,7 +153,9 @@
         <term><command>uudecode</command></term>
         <listitem>
-          <para>reads a file (or by default the standard input) and writes an encoded 
-          version to the standard output. The encoding uses only printing 
-          ASCII characters.</para>
+          <para>
+            reads a file (or by default the standard input) and writes an
+            encoded  version to the standard output. The encoding uses only
+            printing ASCII characters.
+          </para>
           <indexterm zone="sharutils uudecode">
             <primary sortas="b-uudecode">uudecode</primary>
@@ -145,6 +167,8 @@
         <term><command>uuencode</command></term>
         <listitem>
-          <para>reads a file (or by default the standard input) and decodes
-          the uuencoded version to the standard output.</para>
+          <para>
+            reads a file (or by default the standard input) and decodes
+            the uuencoded version to the standard output.
+          </para>
           <indexterm zone="sharutils uuencode">
             <primary sortas="b-uuencode">uuencode</primary>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ introduction/welcome/changelog.xml	(revision 58f0b911d19bed7f6c312b37f3de24c2937ccb20)
@@ -51,4 +51,7 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - DHCP 4.2.5.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Doxygen 1.8.3.1.</para>
         </listitem>
@@ -57,5 +60,11 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - Postfix 2.9.5.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Rasqal 0.9.30.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Sharutils 4.13.3.</para>
         </listitem>
         <listitem>
Index: networking/connect/dhcp.xml
===================================================================
--- networking/connect/dhcp.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ networking/connect/dhcp.xml	(revision 58f0b911d19bed7f6c312b37f3de24c2937ccb20)
@@ -7,7 +7,7 @@
   <!ENTITY dhcp-download-http " ">
   <!ENTITY dhcp-download-ftp  "ftp://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-md5sum        "fe36056f2d274fa4b82a5422f192e65f">
-  <!ENTITY dhcp-size          "7.8 MB">
-  <!ENTITY dhcp-buildsize     "189 MB">
+  <!ENTITY dhcp-md5sum        "6489e919ac093d17249270ee9be1020e">
+  <!ENTITY dhcp-size          "7.9 MB">
+  <!ENTITY dhcp-buildsize     "185 MB">
   <!ENTITY dhcp-time          "0.5 SBU">
 ]>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision c3c56b2eddca26d615282f42653585e9b4fa962b)
+++ server/mail/postfix.xml	(revision 58f0b911d19bed7f6c312b37f3de24c2937ccb20)
@@ -7,9 +7,9 @@
   <!ENTITY postfix-download-http " ">
   <!ENTITY postfix-download-ftp
-  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum "230bc3c00c051946eccd850058d75f6c">
-  <!ENTITY postfix-size "3.6 MB">
-  <!ENTITY postfix-buildsize "126 MB">
-  <!ENTITY postfix-time "0.4 SBU">
+           "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
+  <!ENTITY postfix-md5sum        "588e1c54588e6da0c4b3436f1c2c2fb3">
+  <!ENTITY postfix-size          "3.6 MB">
+  <!ENTITY postfix-buildsize     "185 MB">
+  <!ENTITY postfix-time          "0.5 SBU">
 ]>
 
@@ -82,21 +82,25 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="openssl"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="mysql"/>,
+      <xref linkend="openldap"/>,
       <xref linkend="pcre"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="cyrus-sasl"/>, 
-      <xref linkend="sqlite"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="postgresql"/>, and
-      <ulink url="http://cr.yp.to/cdb.html">cdb</ulink> or
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/> and
+      <ulink url="http://cr.yp.to/cdb.html">CDB</ulink> or
       <ulink url="http://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink>
     </para>
 
     <para>
-      Note that <application>Sqlite</application>,
-      <application>Mysql</application>, <application>Postgresql</application>
-      and <application>cdb</application> are only useful if there is a known
+      Note that <application>SQLite</application>,
+      <application>MySQL</application>, <application>PostgreSQL</application>
+      and <application>CDB</application> are only useful if there is a known
       need for them.
     </para>
@@ -112,4 +116,5 @@
     <sect3>
       <title>Adding Users and Groups</title>
+
       <para>
         Before you compile the program, you need to create users and groups that
@@ -121,6 +126,6 @@
 <screen role="root"><userinput>groupadd -g 32 postfix &amp;&amp;
 groupadd -g 33 postdrop &amp;&amp;
-useradd -c "Postfix Daemon User" -d /dev/null -g postfix \
-    -s /bin/false -u 32 postfix &amp;&amp;
+useradd -c "Postfix Daemon User" -d /var/spool/postfix -g postfix \
+        -s /bin/false -u 32 postfix &amp;&amp;
 chown -v postfix:postfix /var/mail</userinput></screen>
     </sect3>
@@ -152,33 +157,4 @@
       </para>
 
-<!--
-      <para>
-        Here is an example that combines the TLS and
-      <application>Cyrus-SASL</application> arguments:
-        </para>
-
-<screen><userinput>make makefiles \
-CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \
-    -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
-    -DDEF_MANPAGE_DIR=\"/usr/share/man\" \
-    -DDEF_HTML_DIR=\"/usr/share/doc/postfix-&postfix-version;/html\" \
-    -DDEF_README_DIR=\"/usr/share/doc/postfix-&postfix-version;/README\" \
-    -I/usr/include/openssl -I/usr/include/sasl' \
-    AUXLIBS='-lssl -lcrypto -lsasl2'</userinput></screen>
--->
-
-<!-- it picks up pcre automatically now
-      <sect4>
-        <title>Perl compatible regular expressions</title>
-
-        <para>
-          To use <application>PCRE</application> with
-          <application>Postfix</application>, use the following argument:
-        </para>
-
-<screen><literal>CCARGS='-DHAS_PCRE'</literal></screen>
-      </sect4>
--->
-
       <sect4>
         <title>Cyrus-SASL</title>
@@ -191,4 +167,5 @@
 <screen><literal>CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl'
 AUXLIBS='-lsasl2'</literal></screen>
+
       </sect4>
 
@@ -203,4 +180,5 @@
 <screen><literal>CCARGS='-DHAS_LDAP'
 AUXLIBS='-lldap -llber'</literal></screen>
+
       </sect4>
 
@@ -215,4 +193,5 @@
 <screen><literal>CCARGS='-DHAS_SQLITE'
 AUXLIBS='-lsqlite3 -lpthread'</literal></screen>
+
       </sect4>
 
@@ -227,4 +206,5 @@
 <screen><literal>CCARGS='-DHAS_MYSQL -I/usr/include/mysql'
 AUXLIBS='-lmysqlclient -lz -lm'</literal></screen>
+
       </sect4>
 
@@ -239,4 +219,5 @@
 <screen><literal>CCARGS='-DHAS_PGSQL -I/usr/include/postgresql'
 AUXLIBS='-lpq -lz -lm'</literal></screen>
+
       </sect4>
 
@@ -252,4 +233,5 @@
 <screen><literal>CCARGS='-DHAS_CDB'
 AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
+
       </sect4>
 
@@ -265,4 +247,5 @@
 AUXLIBS='-lssl -lcrypto'</literal></screen>
       </sect4>
+
     </sect3>
 
@@ -271,10 +254,12 @@
 
       <para>
-        If you have <application>OpenSSL</application> installed, install
+        If you have <application>Cyrus SASL</application> and
+        <application>OpenSSL</application> installed, install
         <application>Postfix</application> by running the following commands:
       </para>
 
-<screen><userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/ -DNO_NIS" \
-     AUXLIBS="-lssl -lcrypto"                            \
+<screen><userinput>make CCARGS="-DNO_NIS -DUSE_TLS -I/usr/include/openssl/            \
+             -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" \
+     AUXLIBS="-lssl -lcrypto -lsasl2"                              \
      makefiles &amp;&amp;
 make</userinput></screen>
@@ -292,8 +277,11 @@
 
 <screen role="root"><userinput>sh postfix-install -non-interactive \
-  manpage_directory=/usr/share/man \
-  html_directory=/usr/share/doc/postfix-&postfix-version;/html \
-  readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput></screen>
+   daemon_directory=/usr/lib/postfix \
+   manpage_directory=/usr/share/man \
+   html_directory=/usr/share/doc/postfix-&postfix-version;/html \
+   readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput></screen>
+
     </sect3>
+
   </sect2>
 
@@ -309,5 +297,5 @@
     <para>
       <parameter>-DNO_NIS</parameter>: This option disables building Network
-      Information Service/Yellow Pages support. The RPC implementation in glibc
+      Information Service/Yellow Pages support. The RPC implementation in Glibc
       (on which NIS/YP depends) is deprecated.
     </para>
@@ -320,4 +308,5 @@
       options are not set then the documentation will not be installed.
     </para>
+
   </sect2>
 
@@ -383,7 +372,11 @@
       </note>
 
-      <note><para><application>Postfix</application> can also be set up to
-      run in a chroot jail.  See the file in the source 
-      <filename>examples/chroot-setup/LINUX2</filename> for details.</para></note>
+      <note>
+        <para>
+          <application>Postfix</application> can also be set up to
+          run in a chroot jail. See the file in the source 
+          <filename>examples/chroot-setup/LINUX2</filename> for details.
+        </para>
+      </note>
 
       <para>
@@ -405,4 +398,5 @@
 <screen role="root"><userinput>/usr/sbin/postfix check &amp;&amp;
 /usr/sbin/postfix start</userinput></screen>
+
     </sect3>
 
@@ -421,5 +415,7 @@
 
 <screen role="root"><userinput>make install-postfix</userinput></screen>
+
     </sect3>
+
   </sect2>
 
@@ -429,4 +425,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -435,9 +432,15 @@
           mailq, newaliases, postaliases, postcat, postconf, postdrop, postfix,
           postkick, postlock, postlog, postmap, postmulti, postqueue, postsuper
-          and sendmail.
+          and sendmail
         </seg>
         <seg>
-          /etc/postfix, /usr/libexec/postfix, /var/lib/postfix,
-          /var/spool/postfix and /usr/share/doc/postfix-&postfix-version;
+          None
+        </seg>
+        <seg>
+          /etc/postfix,
+          /usr/lib/postfix,
+          /usr/share/doc/postfix-&postfix-version;,
+          /var/lib/postfix and
+          /var/spool/postfix
         </seg>
       </seglistitem>
@@ -607,7 +610,7 @@
         <listitem>
           <para>
-        The <application>Postfix</application> user interface for
-          queue management.
-        </para>
+            The <application>Postfix</application> user interface for
+            queue management.
+          </para>
           <indexterm zone="postfix postqueue">
             <primary sortas="b-postqueue">postqueue</primary>
@@ -620,7 +623,7 @@
         <listitem>
           <para>
-        The <application>Postfix</application> user interface for
-          superuser queue management.
-        </para>
+            The <application>Postfix</application> user interface for
+            superuser queue management.
+          </para>
           <indexterm zone="postfix postsuper">
             <primary sortas="b-postsuper">postsuper</primary>
@@ -641,5 +644,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
