Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision ea5492c31850c690792b8e416a4296ff9d96f534)
+++ chapter01/changelog.xml	(revision e88a471b185846c93c91f39dcd12aa147006b03e)
@@ -44,4 +44,17 @@
 -->
     <listitem>
+      <para>2017-12-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to util-linux-2.31.1.  Fixes
+          <ulink url="&lfs-ticket-root;4176">#4176</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[dj] - Correct build issue with systemd-236 tests.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-12-19</para>
       <itemizedlist>
@@ -54,5 +67,5 @@
           <ulink url="&lfs-ticket-root;4173">#4173</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[bdubbs] - Update to systemd-236.  Fixes
           <ulink url="&lfs-ticket-root;4174">#4174</ulink>.</para>
@@ -72,5 +85,5 @@
           <ulink url="&lfs-ticket-root;4170">#4170</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="sysv">
           <para>[bdubbs] - Update to eudev-3.2.5.  Fixes
           <ulink url="&lfs-ticket-root;4169">#4169</ulink>.</para>
@@ -99,5 +112,5 @@
           <ulink url="&lfs-ticket-root;4167">#4167</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[bdubbs] - Update to dbus-1.12.2.  Fixes
           <ulink url="&lfs-ticket-root;4166">#4166</ulink>.</para>
@@ -181,5 +194,5 @@
     </listitem>
 
-    <listitem>
+    <listitem revision="sysv">
       <para>2017-10-27</para>
       <itemizedlist>
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision ea5492c31850c690792b8e416a4296ff9d96f534)
+++ chapter06/systemd.xml	(revision e88a471b185846c93c91f39dcd12aa147006b03e)
@@ -44,7 +44,12 @@
 
 <screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
+
     <para>Set up the man pages:</para>
 
 <screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
+
+    <para>Remove tests that cannot be built in chroot:</para>
+
+<screen><userinput remap="pre">sed '179,223d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
@@ -61,4 +66,5 @@
       -Ddefault-dnssec=no          \
       -Dfirstboot=false            \
+      -Dinstall-tests=false        \
       -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
@@ -101,4 +107,11 @@
           the first time. They are not useful for LFS because
           everything is done manually.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dinstall-tests=false</parameter></term>
+        <listitem>
+          <para>This switch prevents installation of the compiled tests.</para>
         </listitem>
       </varlistentry>
Index: general.ent
===================================================================
--- general.ent	(revision ea5492c31850c690792b8e416a4296ff9d96f534)
+++ general.ent	(revision e88a471b185846c93c91f39dcd12aa147006b03e)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20171219">
+<!ENTITY version         "SVN-20171222">
 <!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        "20171219-systemd">
+<!ENTITY versiond        "20171222-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "December 19, 2017">
+<!ENTITY releasedate     "December 22, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision ea5492c31850c690792b8e416a4296ff9d96f534)
+++ packages.ent	(revision e88a471b185846c93c91f39dcd12aa147006b03e)
@@ -655,8 +655,8 @@
 
 <!ENTITY util-linux-minor "2.31">
-<!ENTITY util-linux-version "2.31">
-<!ENTITY util-linux-size "4,390 KB">
+<!ENTITY util-linux-version "2.31.1">
+<!ENTITY util-linux-size "4,412 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "5b6821c403c3cc6e7775f74df1882a20">
+<!ENTITY util-linux-md5 "7733b583dcb51518944d42aa62ef19ea">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "123 MB">
