Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter01/changelog.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -44,4 +44,26 @@
 -->
     <listitem>
+      <para>2017-06-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.15.1. Fixes
+          <ulink url="&lfs-ticket-root;4098">#4098</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to expat-2.2.1. Fixes
+          <ulink url="&lfs-ticket-root;4096">#4096</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to psmisc-23.1. Fixes
+          <ulink url="&lfs-ticket-root;4094">#4094</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.11.5. Fixes
+          <ulink url="&lfs-ticket-root;4095">#4095</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-06-07</para>
       <itemizedlist>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter01/whatsnew.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -36,7 +36,7 @@
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bash &bash-version;</para>
@@ -75,7 +75,7 @@
       <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Expat-&expat-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Expect &expect-version;</para>
@@ -192,7 +192,7 @@
       <para>Procps-ng &procps-ng-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Psmisc &psmisc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Readline &readline-version;</para>
Index: chapter02/hostreqs.xml
===================================================================
--- chapter02/hostreqs.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter02/hostreqs.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -65,5 +65,5 @@
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
       not recommended as they have not been tested)</para>
-
+<!--
       <note><para>On some distributions, there have been reports that some
       libraries used by gcc can be in an inconsistent state and that this
@@ -74,5 +74,5 @@
       delete the .la files or install the appropriate missing
       package.</para></note>
-
+-->
     </listitem>
 
@@ -222,5 +222,5 @@
 
 bash version-check.sh</userinput></screen>
-
+<!--
   <para>Also check for some library consistency:</para>
 
@@ -238,6 +238,5 @@
 <para>The files identified by this script should be all present
 or all absent, but not only one or two present.</para>
-
-
-<!--</sect2>-->
+-->
+
 </sect1>
Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter06/acl.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -103,5 +103,5 @@
 
       <seglistitem>
-        <seg>chacl, getfacl, and setacl</seg>
+        <seg>chacl, getfacl, and setfacl</seg>
         <seg>libacl.so</seg>
         <seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
@@ -135,10 +135,10 @@
       </varlistentry>
 
-      <varlistentry id="setacl">
-        <term><command>setacl</command></term>
+      <varlistentry id="setfacl">
+        <term><command>setfacl</command></term>
         <listitem>
           <para>Sets file access control lists</para>
-          <indexterm zone="ch-system-acl setacl">
-            <primary sortas="b-setacl">setacl</primary>
+          <indexterm zone="ch-system-acl setfacl">
+            <primary sortas="b-setfacl">setfacl</primary>
           </indexterm>
         </listitem>
Index: chapter06/automake.xml
===================================================================
--- chapter06/automake.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter06/automake.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -42,8 +42,4 @@
     <title>Installation of Automake</title>
 
-    <para>First fix a warning that is caused by perl-5.22 and later:</para>
-
-<screen><userinput remap="pre">sed -i 's:/\\\${:/\\\$\\{:' bin/automake.in</userinput></screen>
-
     <para>Prepare Automake for compilation:</para>
 
@@ -63,5 +59,5 @@
 make -j4 check</userinput></screen>
 
-    <para>Four tests are known to fail.</para>
+    <para>Three tests are known to fail in the LFS environment.</para>
 
     <para>Install the package:</para>
Index: chapter06/sed.xml
===================================================================
--- chapter06/sed.xml	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ chapter06/sed.xml	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -43,6 +43,6 @@
     <para>First fix an issue in the LFS environment and remove a failing test:</para>
 
-<screen><userinput remap="pre">sed -i 's/usr/tools/'       build-aux/help2man
-sed -i 's/panic-tests.sh//' Makefile.in</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/usr/tools/'                 build-aux/help2man
+sed -i 's/testsuite.panic-tests.sh//' Makefile.in</userinput></screen>
 
     <para>Prepare Sed for compilation:</para>
Index: general.ent
===================================================================
--- general.ent	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ general.ent	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -1,3 +1,3 @@
-<!ENTITY version         "SVN-20170607">
+<!ENTITY version         "SVN-20170621">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
@@ -8,5 +8,5 @@
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "June 7, 2017">
+<!ENTITY releasedate     "June 21, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision 98d90032d07f4588d29e2c7f6619f77d312ffa57)
+++ packages.ent	(revision d76a82b22f2ead190d6382c758f948c18d921d17)
@@ -32,9 +32,9 @@
 <!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
 
-<!ENTITY automake-version "1.15">
+<!ENTITY automake-version "1.15.1">
 <!ENTITY am-minor-version "1.15">
-<!ENTITY automake-size "1,462 KB">
+<!ENTITY automake-size "1,475 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "9a1ddb0e053474d9d1105cfe39b0c48d">
+<!ENTITY automake-md5 "24cd3501b6ad8cd4d7e2546f07e8b4d4">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "110 MB">
@@ -153,8 +153,8 @@
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
 
-<!ENTITY expat-version "2.2.0">
-<!ENTITY expat-size "405 KB">
+<!ENTITY expat-version "2.2.1">
+<!ENTITY expat-size "396 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.bz2">
-<!ENTITY expat-md5 "2f47841c829facb346eb6e3fab5212e2">
+<!ENTITY expat-md5 "d9c3baeab58774cefc2f04faf29f2cf8">
 <!ENTITY expat-home "http://expat.sourceforge.net/">
 <!ENTITY expat-ch6-du "6.1 MB">
@@ -401,10 +401,10 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "11">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-patch-version "6">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "93,305 KB">
+<!ENTITY linux-size "93,315 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "b42388665bf214eb8f37407dcf07571a">
+<!ENTITY linux-md5 "ed5930d543c077b82fa8a82fdbef1c52">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
@@ -517,8 +517,8 @@
 <!ENTITY procps-ng-ch6-sbu "0.1 SBU">
 
-<!ENTITY psmisc-version "22.21">
-<!ENTITY psmisc-size "447 KB">
-<!ENTITY psmisc-url "http://downloads.sourceforge.net/project/psmisc/psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "935c0fd6eb208288262b385fa656f1bf">
+<!ENTITY psmisc-version "23.1">
+<!ENTITY psmisc-size "290 KB">
+<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
+<!ENTITY psmisc-md5 "bbba1f701c02fb50d59540d1ff90d8d1">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "4.0 MB">
