Index: chapter01/askforhelp.xml
===================================================================
--- chapter01/askforhelp.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter01/askforhelp.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -39,5 +39,7 @@
     <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>
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter01/changelog.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -11,5 +11,8 @@
   <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
@@ -40,4 +43,56 @@
     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>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter01/whatsnew.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -1,3 +1,4 @@
 <?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" [
@@ -59,7 +60,7 @@
       <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>
@@ -68,7 +69,7 @@
       <para>Eudev &eudev-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Expat-&expat-version;</para>
@@ -92,7 +93,7 @@
       <para>GCC &gcc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>GDBM &gdbm-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
@@ -158,7 +159,7 @@
       <para>M4 &m4-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Make &make-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Man-DB &man-db-version;</para>
@@ -203,7 +204,7 @@
       <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>
@@ -277,4 +278,8 @@
     </listitem>
 
+    <listitem revision="systemd">
+      <para>systemd-229-compat-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter03/packages.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -634,5 +634,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry revision="sysv">
       <term>Udev-lfs Tarball (&udev-lfs-version;) - <token>&udev-lfs-size;</token>:</term>
       <listitem>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter03/patches.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -91,12 +91,4 @@
     </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>
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter06/chapter06.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -32,13 +32,10 @@
   <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"/>
@@ -51,17 +48,15 @@
   <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 -->
@@ -69,6 +64,10 @@
 
   <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"/>
@@ -76,5 +75,4 @@
   <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"/>
@@ -87,12 +85,10 @@
   <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"/>
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter06/systemd.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -46,9 +46,9 @@
 <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>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+    <para>Fix a potential security issue with framebuffer devices:</para>
+
+<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>
@@ -88,15 +88,16 @@
     <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>
 
@@ -169,4 +170,11 @@
           <filename>/etc/passwd</filename> files. Both files
           were created early in this chapter.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-default-dnssec=no</parameter></term>
+        <listitem>
+          <para>This switch turns off the experimental DNSSEC suport.</para>
         </listitem>
       </varlistentry>
Index: chapter07/chapter07.xml
===================================================================
--- chapter07/chapter07.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter07/chapter07.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -12,4 +12,5 @@
   <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"/>
Index: chapter07/systemd-custom.xml
===================================================================
--- chapter07/systemd-custom.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter07/systemd-custom.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -87,5 +87,5 @@
     <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>
@@ -110,5 +110,5 @@
 
     <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 
@@ -144,10 +144,11 @@
     <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>
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter08/grub.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -129,5 +129,5 @@
     <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
@@ -141,4 +141,18 @@
 }</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
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter08/kernel.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -210,5 +210,7 @@
     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.
@@ -319,6 +321,7 @@
       <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>
@@ -341,5 +344,6 @@
 
       <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,
Index: chapter09/theend.xml
===================================================================
--- chapter09/theend.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ chapter09/theend.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -50,5 +50,5 @@
   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
Index: general.ent
===================================================================
--- general.ent	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ general.ent	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -1,8 +1,8 @@
-<!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"> 
@@ -23,4 +23,5 @@
 <!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">
 
Index: packages.ent
===================================================================
--- packages.ent	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ packages.ent	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -107,8 +107,8 @@
 <!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">
@@ -136,8 +136,8 @@
      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">
@@ -221,8 +221,8 @@
 <!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">
@@ -326,8 +326,8 @@
 <!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">
@@ -367,5 +367,5 @@
 
 <!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">
@@ -420,8 +420,8 @@
 <!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">
@@ -439,5 +439,5 @@
 
 <!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">
@@ -550,11 +550,11 @@
 <!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">
@@ -586,5 +586,5 @@
 
 <!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">
Index: patches.ent
===================================================================
--- patches.ent	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ patches.ent	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -43,6 +43,2 @@
 <!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">
-
Index: prologue/errata.xml
===================================================================
--- prologue/errata.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ prologue/errata.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -15,6 +15,8 @@
   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>
Index: prologue/why.xml
===================================================================
--- prologue/why.xml	(revision cbd8bf0ff339fce586b58ae892de89b30b078241)
+++ prologue/why.xml	(revision e787b1fe1487300d51ec7be69d3f98957c137453)
@@ -108,6 +108,6 @@
         procedures of every package in LFS.</para>
       </listitem>
-<!--
-      <listitem>
+
+      <listitem revision="systemd">
         <para>D-Bus</para>
 
@@ -116,5 +116,5 @@
         </para>
       </listitem>
--->
+
       <listitem>
         <para>DejaGNU</para>
@@ -140,5 +140,5 @@
       </listitem>
 
-      <listitem>
+      <listitem revision="sysv">
         <para>Eudev</para>
 
@@ -466,5 +466,5 @@
       </listitem>
 
-      <listitem>
+      <listitem revision="sysv">
         <para>Sysklogd</para>
 
@@ -473,6 +473,6 @@
         events occur.</para>
       </listitem>
-<!--
-      <listitem>
+
+      <listitem revision="systemd">
         <para>Systemd</para>
 
@@ -483,6 +483,6 @@
         alternative boot systems for comparison.</para>
       </listitem>
--->
-      <listitem>
+
+      <listitem revision="sysv">
         <para>Sysvinit</para>
 
