Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 8a5a68d455b0ee06e7692aa26a1ba5467e8cc78f)
+++ chapter01/changelog.xml	(revision c32384e4cd6671e5a2b4461bf36c659db61554dc)
@@ -44,4 +44,32 @@
 -->
     <listitem>
+      <para>2017-04-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.0.586. Fixes
+          <ulink url="&lfs-ticket-root;4078">#4078</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to eudev-3.2.2. Fixes
+          <ulink url="&lfs-ticket-root;4077">#4077</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.10.12. Fixes
+          <ulink url="&lfs-ticket-root;4075">#4075</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gperf-3.1. Fixes
+          <ulink url="&lfs-ticket-root;4053">#4053</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Improve instructions to save debugging
+          information for selected libraries when stripping at
+          the end of Chapter 6. Fixes 
+          <ulink url="&lfs-ticket-root;4076">#4076</ulink> (again).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-04-22</para>
       <itemizedlist>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 8a5a68d455b0ee06e7692aa26a1ba5467e8cc78f)
+++ chapter01/whatsnew.xml	(revision c32384e4cd6671e5a2b4461bf36c659db61554dc)
@@ -69,7 +69,7 @@
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>Eudev &eudev-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
@@ -108,7 +108,7 @@
       <para>GMP &gmp-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gperf-&gperf-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Grep &grep-version;</para>
@@ -228,7 +228,7 @@
       <para>Util-Linux &util-linux-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Vim &vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
Index: chapter06/strippingagain.xml
===================================================================
--- chapter06/strippingagain.xml	(revision 8a5a68d455b0ee06e7692aa26a1ba5467e8cc78f)
+++ chapter06/strippingagain.xml	(revision c32384e4cd6671e5a2b4461bf36c659db61554dc)
@@ -11,5 +11,6 @@
   <title>Stripping Again</title>
 
-  <para>If the intended user is not a programmer and does not plan to do
+  <para>This section is optional.  If the intended user is not a 
+  programmer and does not plan to do
   any debugging on the system software, the system size can be decreased
   by about 90 MB by removing the debugging symbols from binaries and
@@ -23,18 +24,36 @@
   backup of the LFS system in its current state.</para>
 
-  <para>First back up some libraries whose debug symbols are needed when
-  running regression tests in BLFS packages:</para>
+  <para>First place the debugging sysmbols for selected libraries 
+  in separate files.  This debugging information is needed if running 
+  regression tests that use <ulink 
+  url='&blfs-book;/general/prog/valgrind.html'>valgrind</ulink> or <ulink 
+  url='&blfs-book;/general/prog/gdb.html'>gdb</ulink> later in BLFS.
+  </para>
 
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from gcc -->
-<screen><userinput>save_libs="ld- libatomic libc- libcilkrts libitm libmpx libpthread"
-save_libs="$save_libs libquadmath libsanitizer libstdc++ libthread_db libvtv"
 
-mkdir -p /var/dbg/lib /var/dbg/usr/lib
+<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"
 
-for lib in $save_libs
-do
-    find /usr/lib -name ${lib}*so* -type f -exec cp {} /var/dbg/usr/lib \;
-    find /lib     -name ${lib}*so* -type f -exec cp {} /var/dbg/lib     \;
-done</userinput></screen>
+cd /lib
+
+for LIB in $save_lib; do
+    objcopy --only-keep-debug $LIB $LIB.dbg 
+    strip --strip-unneeded $LIB
+    objcopy --add-gnu-debuglink=$LIB.dbg $LIB 
+done    
+
+save_usrlib="libquadmath.o.0.0.0 libstdc++.so.6.0.22 
+             libmpx.so.2.0.0 libmpxwrappers.so.2.0.0 libitm.so.1.0.0 
+             libcilkrts.so.5.0.0 libatomic.so.1.2.0"
+
+cd /usr/lib
+
+for LIB in $save_usrlib; do
+    objcopy --only-keep-debug $LIB $LIB.dbg
+    strip --strip-unneeded $LIB
+    objcopy --add-gnu-debuglink=$LIB.dbg $LIB
+done
+
+unset LIB save_lib save_usrlib</userinput></screen>
 
   <para>Before performing the stripping, take special care to ensure that
@@ -58,5 +77,5 @@
    -exec /tools/bin/strip --strip-debug {} ';'
 
-/tools/bin/find /lib /usr/lib -type f -name \*.so* \
+/tools/bin/find /lib /usr/lib -type f \(-name \*.so* -a ! -name \*dbg\) \
    -exec /tools/bin/strip --strip-unneeded {} ';'
 
@@ -69,12 +88,3 @@
   binaries.</para>
 
-  <para>If desired, restore the saved libraries with the debug data
-  intact.  The files can restored now or just held for later use.  Note
-  that several of the files cannot be copied directly after rebooting
-  to the new LFS system. Later use requires booting to another system,
-  mounting the LFS partition, and then copying the files.</para>
-
-<screen><userinput>cp -av /var/dbg/lib/* /lib
-cp -av /var/dbg/usr/lib/* /usr/lib</userinput></screen>
-
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 8a5a68d455b0ee06e7692aa26a1ba5467e8cc78f)
+++ general.ent	(revision c32384e4cd6671e5a2b4461bf36c659db61554dc)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20170422">
+<!ENTITY version         "SVN-20170425">
 <!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        "20170422-systemd">
+<!ENTITY versiond        "20170425-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "April 11, 2017">
+<!ENTITY releasedate     "April 25, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision 8a5a68d455b0ee06e7692aa26a1ba5467e8cc78f)
+++ packages.ent	(revision c32384e4cd6671e5a2b4461bf36c659db61554dc)
@@ -146,8 +146,8 @@
 <!ENTITY e2fsprogs-ch6-sbu "4.1 SBU">
 
-<!ENTITY eudev-version "3.2.1">
-<!ENTITY eudev-size "1,778 KB">
+<!ENTITY eudev-version "3.2.2">
+<!ENTITY eudev-size "1,780 KB">
 <!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "49f71f6c271ffa95b3c20d757d45c2e5">
+<!ENTITY eudev-md5 "41e19b70462692fefd072a3f38818b6e">
 <!ENTITY eudev-ch6-du "78 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
@@ -259,8 +259,8 @@
 <!ENTITY gmp-ch6-sbu "1.3 SBU">
 
-<!ENTITY gperf-version "3.0.4">
-<!ENTITY gperf-size "961 KB">
+<!ENTITY gperf-version "3.1">
+<!ENTITY gperf-size "1,188 KB">
 <!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
-<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
+<!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e">
 <!ENTITY gperf-home "&gnu-software;gperf/">
 <!ENTITY gperf-ch6-du "5.4 MB">
@@ -393,10 +393,10 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "10">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "92,033 KB">
+<!ENTITY linux-size "92,041 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "1b0750c97a9f2913f94692bf1399056f">
+<!ENTITY linux-md5 "64ea1adbb60a311e03c24c99471db3f7">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
@@ -618,9 +618,9 @@
 <!ENTITY util-linux-ch6-sbu "1.0 SBU">
 
-<!ENTITY vim-version "8.0.069">
+<!ENTITY vim-version "8.0.586">
 <!ENTITY vim-docdir "vim/vim80">
-<!ENTITY vim-size "10,389 KB">
+<!ENTITY vim-size "10,613 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "457543a7754b0d3c1c0aa4d4c3bb4070">
+<!ENTITY vim-md5 "b35e794140c196ff59b492b56c1e73db">
 <!ENTITY vim-home "http://www.vim.org">
 <!ENTITY vim-ch6-du "141 MB">
