Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/createfiles.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -64,4 +64,5 @@
 <literal>root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/bin/false
+messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
@@ -91,4 +92,5 @@
 cdrom:x:15:
 adm:x:16:
+messagebus:x:18:
 mail:x:34:
 nogroup:x:99:</literal>
Index: chapter06/dbus.xml
===================================================================
--- chapter06/dbus.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/dbus.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -26,5 +26,5 @@
     <para>D-Bus is a message bus system, a simple way for applications to talk
     to one another. D-Bus supplies both a system daemon (for events such as
-    “new hardware device added” or “printer queue changed”) and a
+    "new hardware device added" or "printer queue changed") and a
     per-user-login-session daemon (for general IPC needs among user
     applications). Also, the message bus is built on top of a general one-to-one
@@ -47,10 +47,4 @@
     <title>Installation of D-Bus</title>
 
-    <para>The D-Bus system daemon (the message bus) needs to run as a non-priveleged user, so create a suitable group and user:</para>
-
-<screen><userinput remap="pre">groupadd -g 18 messagebus
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
-        -u 18 -g messagebus -s /bin/false messagebus</userinput></screen>
-
     <para>Prepare D-Bus for compilation:</para>
 
@@ -58,9 +52,8 @@
             --sysconfdir=/etc \
             --localstatedir=/var \
+            --libexecdir=/usr/lib/dbus-1.0 \
             --docdir=/usr/share/doc/dbus-&dbus-version; \
-            --libexecdir=/usr/lib/dbus-1.0 \
             --with-console-auth-dir=/run/console/ \
-            --without-systemdsystemunitdir \
-            --disable-systemd</userinput></screen>
+            --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
 
     <variablelist>
@@ -72,21 +65,4 @@
           <para>This specifies the location of the ConsoleKit auth
           directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-systemdsystemunitdir</parameter></term>
-        <listitem>
-          <para>This prevents installation of Systemd unit files as Systemd
-          has not been installed yet (due to a circular dependency; Systemd
-          requires D-Bus, but D-Bus can also use Systemd functionality).</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-systemd</parameter></term>
-        <listitem>
-          <para>This disables Systemd support in D-Bus, again due to the
-          circular dependency between D-Bus and Systemd.</para>
         </listitem>
       </varlistentry>
@@ -103,5 +79,6 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+dbus-uuidgen --ensure</userinput></screen>
 
   </sect2>
@@ -113,9 +90,13 @@
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-monitor, dbus-send,
-        dbus-uuidgen</seg>
+        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
+        dbus-send and dbus-uuidgen</seg>
         <seg>libdbus-1.{so,a}</seg>
+        <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
+        /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version; and
+        /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>
@@ -142,4 +123,15 @@
           <indexterm zone="ch-system-dbus dbus-daemon">
             <primary sortas="b-dbus-daemon">dbus-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-launch">
+        <term><command>dbus-launch</command></term>
+        <listitem>
+          <para>Starts <command>dbus-daemon</command> from a shell
+          script.</para>
+          <indexterm zone="ch-system-dbus dbus-launch">
+            <primary sortas="b-dbus-launch">dbus-launch</primary>
           </indexterm>
         </listitem>
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/findutils.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -75,13 +75,4 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Some of the scripts in the LFS-Bootscripts package depend on
-    <command>find</command>.  As <filename class="directory">/usr</filename>
-    may not be available during the early stages of booting, this program
-    needs to be on the root partition.  The <command>updatedb</command>
-    script also needs to be modified to correct an explicit path:</para>
-
-<screen><userinput remap="install">mv -v /usr/bin/find /bin
-sed -i 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen>
 
   </sect2>
Index: chapter06/intltool.xml
===================================================================
--- chapter06/intltool.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/intltool.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -57,6 +57,6 @@
 
 <screen><userinput remap="install">make install
-install -v -m644 -D doc/I18N-HOWTO \
-  /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
+install -v -Dm644 doc/I18N-HOWTO \
+        /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
 
   </sect2>
@@ -67,5 +67,4 @@
     <segmentedlist>
       <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
       <segtitle>Installed directories</segtitle>
 
@@ -73,5 +72,4 @@
         <seg>intltool-extract, intltool-merge, intltool-prepare,
         intltool-update, and intltoolize</seg>
-        <seg>None</seg>
         <seg>/usr/share/doc/intltool-&intltool-version; and
         /usr/share/intltool</seg>
Index: chapter06/kbd.xml
===================================================================
--- chapter06/kbd.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/kbd.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -57,6 +57,5 @@
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd \
-  --disable-vlock</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock</userinput></screen>
 
     <variablelist>
@@ -128,5 +127,5 @@
         kbd_mode, kbdrate, loadkeys, loadunimap,
         mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
-        psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
+        psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
         setfont, setkeycodes, setleds, setmetamode,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
@@ -302,5 +301,5 @@
       </varlistentry>
 
-  <!--<varlistentry id="resizecons">
+  <varlistentry id="resizecons">
         <term><command>resizecons</command></term>
         <listitem>
@@ -310,5 +309,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>-->
+      </varlistentry>
 
       <varlistentry id="setfont">
Index: chapter06/kmod.xml
===================================================================
--- chapter06/kmod.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/kmod.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -158,4 +158,46 @@
       </varlistentry>
 
+      <varlistentry id="lsmod">
+        <term><command>lsmod</command></term>
+        <listitem>
+          <para>Lists currently loaded modules</para>
+          <indexterm zone="ch-system-kmod lsmod">
+            <primary sortas="b-lsmod">lsmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="modinfo">
+        <term><command>modinfo</command></term>
+        <listitem>
+          <para>Examines an object file associated with a kernel module and
+          displays any information that it can glean</para>
+          <indexterm zone="ch-system-kmod modinfo">
+            <primary sortas="b-modinfo">modinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="modprobe">
+        <term><command>modprobe</command></term>
+        <listitem>
+          <para>Uses a dependency file, created by
+          <command>depmod</command>, to automatically load relevant modules</para>
+          <indexterm zone="ch-system-kmod modprobe">
+            <primary sortas="b-modprobe">modprobe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmmod">
+        <term><command>rmmod</command></term>
+        <listitem>
+          <para>Unloads modules from the running kernel</para>
+          <indexterm zone="ch-system-kmod rmmod">
+            <primary sortas="b-rmmod">rmmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libkmod">
         <term><filename class="libraryfile">libkmod</filename></term>
@@ -169,46 +211,4 @@
       </varlistentry>
 
-      <varlistentry id="lsmod">
-        <term><command>lsmod</command></term>
-        <listitem>
-          <para>Lists currently loaded modules</para>
-          <indexterm zone="ch-system-kmod lsmod">
-            <primary sortas="b-lsmod">lsmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modinfo">
-        <term><command>modinfo</command></term>
-        <listitem>
-          <para>Examines an object file associated with a kernel module and
-          displays any information that it can glean</para>
-          <indexterm zone="ch-system-kmod modinfo">
-            <primary sortas="b-modinfo">modinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modprobe">
-        <term><command>modprobe</command></term>
-        <listitem>
-          <para>Uses a dependency file, created by
-          <command>depmod</command>, to automatically load relevant modules</para>
-          <indexterm zone="ch-system-kmod modprobe">
-            <primary sortas="b-modprobe">modprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmmod">
-        <term><command>rmmod</command></term>
-        <listitem>
-          <para>Unloads modules from the running kernel</para>
-          <indexterm zone="ch-system-kmod rmmod">
-            <primary sortas="b-rmmod">rmmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: chapter06/sysvinit.xml
===================================================================
--- chapter06/sysvinit.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/sysvinit.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -42,7 +42,11 @@
     <title>Installation of Sysvinit</title>
 
-    <para>Compile the package:</para>
+    <para>Since LFS uses Systemd as init system, this package
+    is needed for few utils that are not present in other
+    packages. Compile the package:</para>
 
-<screen><userinput remap="make">make -C src</userinput></screen>
+<screen><userinput remap="make">make -C src fstab-decode
+make -C src killall5
+make -C src last</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -50,5 +54,13 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make -C src install</userinput></screen>
+<screen><userinput remap="install">cp -v src/{fstab-decode,killall5} /sbin
+ln -sv ../sbin/killall5 /bin/pidof
+cp -v src/last /usr/bin
+ln -sv last /usr/bin/lastb</userinput></screen>
+
+    <para>Install manual pages for the installed programs:</para>
+
+<screen><userinput remap="install">cp -v man/{last,lastb}.1 /usr/share/man/man1
+cp -v man/{fstab-decode,killall5,pidof}.8 /usr/share/man/man8</userinput></screen>
 
   </sect2>
Index: chapter06/xz.xml
===================================================================
--- chapter06/xz.xml	(revision 9cefc3b470b487a626aaa39a56bf53a348b7edf2)
+++ chapter06/xz.xml	(revision 8edca0a44669b9e41a0a69e58fdd9549bebfa650)
@@ -47,5 +47,5 @@
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -59,5 +59,13 @@
   <para>Install the package:</para>
 
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
+
+    <para>The shared library needs to be moved to
+    <filename class="directory">/lib</filename>, and as a result the
+    <filename class="extension">.so</filename> file in
+    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+
+<screen><userinput remap="install">mv -v /usr/lib/liblzma.so.* /lib
+ln -sfv ../../lib/liblzma.so.5.0.4 /usr/lib/liblzma.so</userinput></screen>
 
   </sect2>
