Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ chapter01/changelog.xml	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -44,4 +44,23 @@
 -->
     <listitem>
+      <para>2017-05-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move library versions for presevation 
+          of debugging symbols to packages.ent. Fixes
+          <ulink url="&lfs-ticket-root;4085">#4085</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.11.1. Fixes
+          <ulink url="&lfs-ticket-root;4086">#4086</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to shadow-4.5. Fixes
+          <ulink url="&lfs-ticket-root;4087">#4087</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-05-13</para>
       <itemizedlist>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ chapter01/whatsnew.xml	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -201,7 +201,7 @@
       <para>Sed &sed-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Shadow &shadow-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>Sysklogd &sysklogd-version;</para>
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ chapter06/shadow.xml	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -71,30 +71,4 @@
        -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen>
 
-    <para>Now fix a bug that prevents <command>useradd</command> from 
-    setting the shell entry in the /etc/passwd file.  In this case we need a 
-    short patch, but can include it directly here without the need for a
-    separate file:</para>
-
-<screen><userinput remap="pre">echo '--- src/useradd.c   (old)
-+++ src/useradd.c   (new)
-@@ -2027,6 +2027,8 @@
-        is_shadow_grp = sgr_file_present ();
- #endif
- 
-+       get_defaults ();
-+
-        process_flags (argc, argv);
- 
- #ifdef ENABLE_SUBIDS
-@@ -2036,8 +2038,6 @@
-            (!user_id || (user_id &lt;= uid_max &amp;&amp; user_id >= uid_min));
- #endif                         /* ENABLE_SUBIDS */
- 
--       get_defaults ();
--
- #ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
-        {' | patch -p0 -l</userinput></screen>
-
     <note>
       <para>If you chose to build Shadow with Cracklib support, run the following:</para>
@@ -107,8 +81,4 @@
 
 <screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
-
-    <para>Fix a security issue identified upstream:</para>
-
-<screen><userinput remap="pre">sed -i -e '47 d' -e '60,65 d' libmisc/myname.c</userinput></screen>
 
     <para>Prepare Shadow for compilation:</para>
Index: chapter06/strippingagain.xml
===================================================================
--- chapter06/strippingagain.xml	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ chapter06/strippingagain.xml	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -33,5 +33,6 @@
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from gcc -->
 
-<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"
+<!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
+<screen><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
 
 cd /lib
@@ -43,7 +44,7 @@
 done    
 
-save_usrlib="libquadmath.so.0.0.0 libstdc++.so.6.0.23 
-             libmpx.so.2.0.1 libmpxwrappers.so.2.0.1 libitm.so.1.0.0 
-             libcilkrts.so.5.0.0 libatomic.so.1.2.0"
+save_usrlib="libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
+             libmpx.so.&libmpx-version; libmpxwrappers.so.&libmpxwrap-version; libitm.so.&libitm-version;
+             libcilkrts.so.&libcilkrts-version; libatomic.so.&libatomic-version;"
 
 cd /usr/lib
Index: general.ent
===================================================================
--- general.ent	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ general.ent	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20170513">
+<!ENTITY version         "SVN-20170518">
 <!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        "20170513-systemd">
+<!ENTITY versiond        "20170518-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 13, 2017">
+<!ENTITY releasedate     "May 18, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
Index: packages.ent
===================================================================
--- packages.ent	(revision 1af5572aaad365433600104dfb07cdc88046cc02)
+++ packages.ent	(revision 00abb8f1501e00263aba78e959e2a84471c15aea)
@@ -219,4 +219,11 @@
 <!ENTITY gcc-ch6-du "3.3 GB ">
 <!ENTITY gcc-ch6-sbu "82 SBU (with tests)">
+<!ENTITY libquadmath-version "0.0.0">
+<!ENTITY libstdcpp-version   "6.0.23">
+<!ENTITY libitm-version      "1.0.0">
+<!ENTITY libatomic-version   "1.2.0">
+<!ENTITY libmpx-version      "2.0.1">
+<!ENTITY libmpxwrap-version  "2.0.1">
+<!ENTITY libcilkrts-version  "5.0.0">
 
 <!ENTITY libstdcpp-ch5-du "898 MB">
@@ -250,4 +257,5 @@
 <!ENTITY glibc-ch6-du "1.5 GB">
 <!ENTITY glibc-ch6-sbu "20 SBU">
+<!ENTITY libthread_db-version "1.0">
 
 <!ENTITY gmp-version "6.1.2">
@@ -393,10 +401,10 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "11">
-<!ENTITY linux-patch-version "0">
-<!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,211 KB">
+<!ENTITY linux-patch-version "1">
+<!--<!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,285 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "251a5deee0fa6daf3f356b1bbda9eab8">
+<!ENTITY linux-md5 "9a75a70346aff3be6147e2478a581c18">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
@@ -535,8 +543,8 @@
 <!ENTITY sed-ch6-sbu "0.3 SBU">
 
-<!ENTITY shadow-version "4.4">
-<!ENTITY shadow-size "1,593 KB">
+<!ENTITY shadow-version "4.5">
+<!ENTITY shadow-size "1,589 KB">
 <!ENTITY shadow-url "https://github.com/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "c06f8c2571b44899e60662f9ad259dd6">
+<!ENTITY shadow-md5 "c350da50c2120de6bb29177699d89fe3">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/"> 
 <!ENTITY shadow-ch6-du "42 MB">
