Update to dbus-1.10.8.

Update to e2fsprogs-1.43. 
Update to gdbm-1.12. 
Update to iproute2-4.6.0. 
Update to make-4.2. 
Update to systemd-230. 

Add additional explanatory text for sytemctl and journalctl commands.
[chapter07/systemd-custom.xml]



git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11078 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

17 files changed, 182 insertions, 105 deletions

diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index f7a9d1efa..70b9b5e44 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -38,7 +38,9 @@
 
     <itemizedlist>
       <listitem>
-        <para>The version of the book being used (in this case &version;)</para>
+        <para>The version of the book being used (in this case 
+              <phrase revision="sysv">&version;</phrase>
+              <phrase revision="systemd">&versiond;</phrase>)</para>
       </listitem>
       <listitem>
         <para>The host distribution and version being used to create LFS</para>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2bdeeb707..6d5aeb5e1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -10,7 +10,10 @@
 
   <title>Changelog</title>
 
-  <para>This is version &version; of the Linux From Scratch book, dated
+  <para>This is version 
+        <phrase revision="sysv">&version;</phrase>
+        <phrase revision="systemd">&versiond;</phrase>
+  of the Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
   version is probably already available. To find out, please check one of the
   mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para>
@@ -39,6 +42,58 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+   <listitem>
+      <para>2016-05-27</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[dj] - Update to dbus-1.10.8. Fixes
+          <ulink url="&lfs-ticket-root;3938">#3938</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to e2fsprogs-1.43. Fixes
+          <ulink url="&lfs-ticket-root;3935">#3935</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gdbm-1.12. Fixes
+          <ulink url="&lfs-ticket-root;3933">#3933</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to iproute2-4.6.0. Fixes
+          <ulink url="&lfs-ticket-root;3934">#3934</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to make-4.2. Fixes
+          <ulink url="&lfs-ticket-root;3936">#3936</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[dj] - Update to systemd-230. Fixes
+          <ulink url="&lfs-ticket-root;3937">#3937</ulink>.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2016-05-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Add additional explanatory text for sytemctl and
+          journalctl commands.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2016-05-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Adjust hosts file instructions to account for hosts
+          using automatic configuration. Ajusted eplanatory text to account
+for
+          additional configurations.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-05-16</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 04b2f10c0..118e30d07 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -1,4 +1,5 @@
 <?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.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -58,18 +59,18 @@
     <listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
     <!--<listitem revision="sysv">
       <para>Eudev &eudev-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Expat-&expat-version;</para>
     </listitem>
@@ -91,9 +92,9 @@
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>GDBM &gdbm-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
@@ -157,9 +158,9 @@
     <!--<listitem>
       <para>M4 &m4-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Make &make-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>-->
@@ -202,9 +203,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd &sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd &systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>SysVinit &sysvinit-version;</para>
     </listitem>-->
@@ -276,6 +277,10 @@
       <para>mpfr-3.1.3-upstream_fixes-2.patch</para>
     </listitem>
 
+    <listitem revision="systemd">
+      <para>systemd-229-compat-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index a510929c8..97e1c6948 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -633,7 +633,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry revision="sysv">
       <term>Udev-lfs Tarball (&udev-lfs-version;) - <token>&udev-lfs-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&udev-lfs-url;"/></para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 3d678ff0e..2228819aa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,14 +90,6 @@
       </listitem>
     </varlistentry>
 
-   <varlistentry revision="systemd">
-      <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-compat-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry revision="sysv">
       <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 5ded6fe9f..34c071103 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -31,15 +31,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
@@ -50,32 +47,33 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
 
   <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
@@ -86,14 +84,12 @@
   <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  
-  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 76ed51378..922017a01 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -45,11 +45,11 @@
 
 <screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
 
-    <para>Apply the following patch so that compat
-    <command>pkg-config</command> files get installed without installing compat
-    libs which are useless on LFS:</para>
+    <para>Fix a potential security issue with framebuffer devices:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -e 's@DRI and frame buffer@DRI@' \
+    -e '/SUBSYTEM==\"graphics\", KERNEL==\"fb\*\"/d' \
+    -i  src/login/70-uaccess.rules</userinput></screen>
 
     <para>Disable two tests that always fail:</para>
 
@@ -87,17 +87,18 @@ EOF</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --config-cache         \
-            --with-rootprefix=     \
-            --with-rootlibdir=/lib \
-            --enable-split-usr     \
-            --disable-firstboot    \
-            --disable-ldconfig     \
-            --disable-sysusers     \
-            --without-python       \
+<screen><userinput remap="configure">./configure --prefix=/usr            \
+            --sysconfdir=/etc        \
+            --localstatedir=/var     \
+            --config-cache           \
+            --with-rootprefix=       \
+            --with-rootlibdir=/lib   \
+            --enable-split-usr       \
+            --disable-firstboot      \
+            --disable-ldconfig       \
+            --disable-sysusers       \
+            --without-python         \
+            --with-default-dnssec=no \
             --docdir=/usr/share/doc/systemd-&systemd-version;</userinput></screen>
 
     <variablelist>
@@ -171,6 +172,13 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--with-default-dnssec=no</parameter></term>
+        <listitem>
+          <para>This switch turns off the experimental DNSSEC suport.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index e3cdcd721..e40e9c627 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -11,6 +11,7 @@
 
   <title>System Configuration and Bootscripts</title>
 
+  <!-- sysv -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 3f2f84f3f..26f29beb4 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -86,7 +86,7 @@ EOF</userinput></screen>
   <sect2>
     <title>Overriding Default Services Behavior</title>
 
-    <para>A systemd service contents can be overriden by creating a directory
+    <para>The parameter of a unit can be overriden by creating a directory
     and a configuration file in <filename
     class="directory">/etc/systemd/system</filename>. For example:</para>
 
@@ -109,7 +109,7 @@ EOF</userinput></screen>
     <title>Debugging the Boot Sequence</title>
 
     <para>Rather than plain shell scripts used in SysVinit or BSD style init
-    systems, systemd uses a unified format for different type of startup
+    systems, systemd uses a unified format for different types of startup
     files (or units). The command <command>systemctl</command> is used to
     enable, disable, controll state, and obtain status of unit files. Here 
     are some examples of frequently used commands:</para>
@@ -143,12 +143,13 @@ EOF</userinput></screen>
   <sect2>
     <title>Working with the Systemd Journal</title>
 
-    <para>Logging on a system booted with systemd is handled by
-    systemd-journald (default), rather than a typical unix syslog daemon. 
-    systemd-journald write log entries to a binary file format, rather than
-    a plain text log file. To assist with parsing the file, the command
-    <command>journalctl</command> is provided. Here are some examples of
-    frequently used commands:</para>
+    <para>Logging on a system booted with systemd is handled with
+    systemd-journald (by default), rather than a typical unix syslog daemon.
+    You can also add a normal syslog daemon and have both work side by
+    side if desired. The systemd-journald program stores journal entries in a
+    binary format rather than a plain text log file. To assist with
+    parsing the file, the command <command>journalctl</command> is provided.
+    Here are some examples of frequently used commands:</para>
 
     <itemizedlist>
        <listitem>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index a8e484bd8..71d1d4c23 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -128,7 +128,7 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
 
     <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
 
-    <screen><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+    <screen revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
 <literal># Begin /boot/grub/grub.cfg
 set default=0
 set timeout=5
@@ -141,6 +141,20 @@ menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
 }</literal>
 EOF</userinput></screen>
 
+    <screen revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+<literal># Begin /boot/grub/grub.cfg
+set default=0
+set timeout=5
+
+insmod ext2
+set root=(hd0,2)
+
+menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
+        linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
+}</literal>
+EOF</userinput></screen>
+
+
     <note><para>From <application>GRUB</application>'s perspective, the
     kernel files are relative to the partition used.  If you
     used a separate /boot partition, remove /boot from the above
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index d955625d7..75f9f63f7 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -209,7 +209,9 @@ File systems  ---&gt;
     the automatic setup of the boot process described in the next section.  The
     following command assumes an x86 architecture:</para>
 
-<screen><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
+<screen revision="sysv"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
+
+<screen revision="systemd"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
 
     <para><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
@@ -318,8 +320,9 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>config-&linux-version;,
-        vmlinuz-&linux-version;-lfs-&version;, and
-        System.map-&linux-version;</seg>
+        <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
+        <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
+        and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -340,7 +343,8 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="lfskernel">
-        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
+        <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
+        <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the computer,
           the kernel is the first part of the operating system that gets loaded.
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index 2d29242b0..3818a7b83 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -49,7 +49,7 @@ EOF</userinput></screen>
   us if you need to ask for help at some point) to find out which LFS version
   is installed on the system. Create this file by running:</para>
 
-<screen revision="systemd"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
+<screen revision="systemd"><userinput>echo &versiond; &gt; /etc/lfs-release</userinput></screen>
 
   <para>It is also a good idea to create a file to show the status of your
   new system with respect to the Linux Standards Base (LSB).  To create
diff --git a/general.ent b/general.ent
index 2a0eb55f7..d4fca24f9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,9 +1,9 @@
-<!ENTITY version         "SVN-20160516-merge">
+<!ENTITY version         "SVN-20160527-merge">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20160407-systemd-merge">
+<!ENTITY versiond        "20160527-systemd-merge">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
@@ -22,6 +22,7 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
+<!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
 <!ENTITY min-kernel      "2.6.32">
 
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
diff --git a/packages.ent b/packages.ent
index 485ddb409..5815ef135 100644
--- a/packages.ent
+++ b/packages.ent
@@ -106,10 +106,10 @@
 <!ENTITY coreutils-ch6-du "168 MB">
 <!ENTITY coreutils-ch6-sbu "2.6 SBU">
 
-<!ENTITY dbus-version "1.10.6">
-<!ENTITY dbus-size "1,908 KB">
+<!ENTITY dbus-version "1.10.8">
+<!ENTITY dbus-size "1,932 KB">
 <!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "26d0cf3a1c9782cb0e342101f0450440">
+<!ENTITY dbus-md5 "e912e930f249454752512aa7ac864d43">
 <!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "23 MB">
 <!ENTITY dbus-ch6-sbu "0.2 SBU">
@@ -135,10 +135,10 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.42.13">
-<!ENTITY e2fsprogs-size "6,360 KB">
+<!ENTITY e2fsprogs-version "1.43">
+<!ENTITY e2fsprogs-size "6,856 KB">
 <!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "bc759fc62666786f5436e2075beb3265">
+<!ENTITY e2fsprogs-md5 "83f3256fcf37dd6dd4acbb648a30625a">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "48 MB">
 <!ENTITY e2fsprogs-ch6-sbu "2.7 SBU">
@@ -220,10 +220,10 @@
 <!ENTITY libstdcpp-ch5-du "893 MB">
 <!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
 
-<!ENTITY gdbm-version "1.11">
-<!ENTITY gdbm-size "796 KB">
+<!ENTITY gdbm-version "1.12">
+<!ENTITY gdbm-size "822 KB">
 <!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5 "72c832680cf0999caedbe5b265c8c1bd">
+<!ENTITY gdbm-md5 "9ce96ff4c99e74295ea19040931c8fb9">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-ch6-du "9.0 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
@@ -325,10 +325,10 @@
 <!ENTITY intltool-ch6-du "1.2 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "4.5.0">
-<!ENTITY iproute2-size "542 KB">
+<!ENTITY iproute2-version "4.6.0">
+<!ENTITY iproute2-size "460 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "b9ee1cbba7e20e04dfdd4b3055181955">
+<!ENTITY iproute2-md5 "d015e437e4f744d51d3a1a53341826d5">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "9.8 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -366,7 +366,7 @@
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
 <!ENTITY libcap-version "2.25">
-<!ENTITY libcap-size "63 KB">
+<!ENTITY libcap-size "64 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
 <!ENTITY libcap-md5 "6666b839e5d46c2ad33fc8aa2ceb5f77">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
@@ -419,10 +419,10 @@
 <!ENTITY m4-ch6-du "30 MB">
 <!ENTITY m4-ch6-sbu "0.4 SBU">
 
-<!ENTITY make-version "4.1">
-<!ENTITY make-size "1,297 KB">
+<!ENTITY make-version "4.2">
+<!ENTITY make-size "1,368 KB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "57a7a224a822f94789a587ccbcedff69">
+<!ENTITY make-md5 "85ad14d08766201ffe71efa866f4fb91">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-ch5-du "12.1 MB">
 <!ENTITY make-ch5-sbu "0.1 SBU">
@@ -438,7 +438,7 @@
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
 
 <!ENTITY man-pages-version "4.06">
-<!ENTITY man-pages-size "1,427 KB">
+<!ENTITY man-pages-size "1,428 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-md5 "a7b6c7e2a03a4b0d61eee4e52de68a42">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
@@ -549,13 +549,13 @@
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version "229">
-<!ENTITY systemd-size    "3,844 KB">
+<!ENTITY systemd-version "230">
+<!ENTITY systemd-size    "3,748 KB">
 <!ENTITY systemd-url     "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "5d5115ee08affe005f821bc5ea3171e8">
+<!ENTITY systemd-md5     "7fd9c7b1296104ccc0b8aee4be3d3c23">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "1.1 GB">
-<!ENTITY systemd-ch6-sbu "5.1 SBU">
+<!ENTITY systemd-ch6-du  "1.0 GB">
+<!ENTITY systemd-ch6-sbu "4.9 SBU">
 
 <!ENTITY sysvinit-version "2.88dsf">
 <!ENTITY sysvinit-size "108 KB">
@@ -585,7 +585,7 @@
 <!ENTITY tcl-ch5-sbu "0.4 SBU">
 
 <!ENTITY texinfo-version "6.1">
-<!ENTITY texinfo-size "4,415 KB">
+<!ENTITY texinfo-size "4,416 KB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
 <!ENTITY texinfo-md5 "1d7ec1888fae00730693597852b00cde">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
diff --git a/patches.ent b/patches.ent
index f3632da58..b150d8c67 100644
--- a/patches.ent
+++ b/patches.ent
@@ -42,7 +42,3 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">
 <!ENTITY sysvinit-consolidated-patch-size "3.9 KB">
 
-<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "8a9b70794ead5a87297d7ccd7a753d78">
-<!ENTITY systemd-compat-patch-size "12 KB">
-
diff --git a/prologue/errata.xml b/prologue/errata.xml
index e5c3f5969..07b80d672 100644
--- a/prologue/errata.xml
+++ b/prologue/errata.xml
@@ -14,8 +14,10 @@
   and enhanced. Security warnings and bug fixes may become available after
   the LFS book has been released. To check whether the package versions or
   instructions in this release of LFS need any modifications to accommodate
-  security vulnerabilities or other bug fixes, please visit <ulink
-  url="&errata;"/> before proceeding with your build. You should note any
+  security vulnerabilities or other bug fixes, please visit
+  <ulink revision="sysv" url="&errata;"/>
+  <ulink revision="systemd" url="&erratad;"/>
+  before proceeding with your build. You should note any
   changes shown and apply them to the relevant section of the book as you
   progress with building the LFS system.</para>
 
diff --git a/prologue/why.xml b/prologue/why.xml
index 387e4d55e..7a302f636 100644
--- a/prologue/why.xml
+++ b/prologue/why.xml
@@ -107,15 +107,15 @@
         command line file management, and are necessary for the installation
         procedures of every package in LFS.</para>
       </listitem>
-<!--
-      <listitem>
+
+      <listitem revision="systemd">
         <para>D-Bus</para>
 
         <para>This package contains programs to implement a message bus system, 
         which a simple way for applications to talk to one another.
         </para>
       </listitem>
--->
+
       <listitem>
         <para>DejaGNU</para>
 
@@ -139,7 +139,7 @@
         tested file systems that Linux supports.</para>
       </listitem>
 
-      <listitem>
+      <listitem revision="sysv">
         <para>Eudev</para>
 
         <para>This package is a device manager.  It dynamically controls the entries
@@ -465,15 +465,15 @@
         in a secure way.</para>
       </listitem>
 
-      <listitem>
+      <listitem revision="sysv">
         <para>Sysklogd</para>
 
         <para>This package contains programs for logging system messages,
         such as those given by the kernel or daemon processes when unusual
         events occur.</para>
       </listitem>
-<!--
-      <listitem>
+
+      <listitem revision="systemd">
         <para>Systemd</para>
 
         <para>This package provides and <application>init</application> program
@@ -482,8 +482,8 @@
         In LFS it is installed side-by-side with Sysvinit to provide the user with
         alternative boot systems for comparison.</para>
       </listitem>
--->
-      <listitem>
+
+      <listitem revision="sysv">
         <para>Sysvinit</para>
 
         <para>This package provides the <application>init</application>