diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a1e140632..0f4099ac8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,40 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
 
+    <listitem>
+      <para>2018-05-05</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Update to gcc-8.1.0.  Fixes 
+           <ulink url="&lfs-ticket-root;4268">#4268</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to linux-4.16.7.  Fixes 
+           <ulink url="&lfs-ticket-root;4262">#4262</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to man-pages-4.16.  Fixes 
+           <ulink url="&lfs-ticket-root;4266">#4266</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to meson-0.46.0.  Fixes 
+           <ulink url="&lfs-ticket-root;4263">#4263</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to shadow-4.6.  Fixes 
+           <ulink url="&lfs-ticket-root;4264">#4264</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to tzdata-2018e.  Fixes 
+           <ulink url="&lfs-ticket-root;4269">#4269</ulink>.</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - Update to xz-5.2.4.  Fixes 
+           <ulink url="&lfs-ticket-root;4265">#4265</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-04-20</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ce42a494e..29fab9dae 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -92,9 +92,9 @@
     <listitem>
       <para>Gawk-&gawk-version;</para>
    </listitem>
-   <!--<listitem>
+   <listitem>
       <para>GCC-&gcc-version;</para>
-   </listitem>-->
+   </listitem>
    <!--<listitem>
       <para>GDBM-&gdbm-version;</para>
    </listitem>-->
@@ -170,9 +170,9 @@
     <listitem>
       <para>Man-DB-&man-db-version;</para>
    </listitem>
-   <!--<listitem>
+   <listitem>
       <para>Man-pages-&man-pages-version;</para>
-   </listitem>-->
+   </listitem>
    <listitem>
       <para>meson-&meson-version;</para>
    </listitem>
@@ -212,9 +212,9 @@
     <listitem>
       <para>Sed-&sed-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Shadow-&shadow-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
@@ -245,9 +245,9 @@
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>XZ-Utils-&xz-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 56ec31d96..716dd52d4 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -44,6 +44,13 @@
       <para>Libelf is part of elfutils-&elfutils-version; package. Use
       the elfutils-&elfutils-version;.tar.xz as the source tarball.</para>
 
+    <para>Fiirst, fix a file to be compatible with gcc-8"</para>
+
+<screen><userinput remap="pre">sed -e '/ALIGN_PRSTATUS)/{ 
+        s/__attribute/attribute_packed &amp;/
+        s/packed, //}' \
+    -i backends/linux-core-note.c</userinput></screen>
+
     <para>Prepare Libelf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index db4a605b0..821ac8315 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -45,7 +45,7 @@ done
 
 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;"
+             libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
 
 cd /usr/lib
 
diff --git a/general.ent b/general.ent
index 0e7950703..044254e51 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180420">
+<!ENTITY version         "SVN-20180505">
 <!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        "20180420-systemd">
+<!ENTITY versiond        "20180505-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "April 20, 2018">
+<!ENTITY releasedate     "May 5, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">
diff --git a/packages.ent b/packages.ent
index ac0da4c22..6089e534b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -108,10 +108,10 @@
 <!ENTITY coreutils-ch6-du "179 MB">
 <!ENTITY coreutils-ch6-sbu "3.3 SBU">
 
-<!ENTITY dbus-version "1.12.6">
-<!ENTITY dbus-size "2,021 KB">
+<!ENTITY dbus-version "1.12.8">
+<!ENTITY dbus-size "2,024 KB">
 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "32a607e47b82ab11702355bf02502f20">
+<!ENTITY dbus-md5 "2764bf150e5aa8005b7bc0d6c388756a">
 <!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "18 MB">
 <!ENTITY dbus-ch6-sbu "0.2 SBU">
@@ -215,10 +215,10 @@
 <!ENTITY gawk-ch6-du "42 MB">
 <!ENTITY gawk-ch6-sbu "0.4 SBU">
 
-<!ENTITY gcc-version "7.3.0">
-<!ENTITY gcc-size "60,999 KB">
+<!ENTITY gcc-version "8.1.0">
+<!ENTITY gcc-size "61,888 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "be2da21680f27624f3a87055c4ba5af2">
+<!ENTITY gcc-md5 "65f7c65818dc540b3437605026d329fc">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "2.2 GB">
 <!ENTITY gcc-ch5p1-sbu "8.8 SBU">
@@ -227,12 +227,12 @@
 <!ENTITY gcc-ch6-du "3.1 GB ">
 <!ENTITY gcc-ch6-sbu "81 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
-<!ENTITY libstdcpp-version   "6.0.24">
+<!ENTITY libstdcpp-version   "6.0.25">
 <!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 libcilkrts-version  "5.0.0">-->
 
 <!ENTITY libstdcpp-ch5-du "752 MB">
 <!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "7">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> 
-<!ENTITY linux-size "100,603 KB">
+<!ENTITY linux-size "100,612 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "db2a61576b7819597c2990e70245704e">
+<!ENTITY linux-md5 "9795a3187c791e3b79153519733f045d">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -462,18 +462,18 @@
 <!ENTITY man-db-ch6-du "31 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "4.15">
-<!ENTITY man-pages-size "1,585 KB">
+<!ENTITY man-pages-version "4.16">
+<!ENTITY man-pages-size "1,592 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "4298feb3d5feffad8ff46bb87b061a07">
+<!ENTITY man-pages-md5 "ad9f1ff81276fe8d90d077484d6d4b5e">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "27 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.45.1">
-<!ENTITY meson-size "1,136 KB">
+<!ENTITY meson-version "0.46.0">
+<!ENTITY meson-size "1,171 KB">
 <!ENTITY meson-url "https://github.com/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "4d9c7b3a7365b7b472f00af14e034949">
+<!ENTITY meson-md5 "e3301606017e364a0d7e1c3b755e7a28">
 <!ENTITY meson-home "http://mesonbuild.com">
 <!ENTITY meson-ch6-du "16 MB">
 <!ENTITY meson-ch6-sbu "0.1 SBU">
@@ -596,10 +596,10 @@
 <!ENTITY sed-ch6-du "26 MB">
 <!ENTITY sed-ch6-sbu "0.3 SBU">
 
-<!ENTITY shadow-version "4.5">
-<!ENTITY shadow-size "1,589 KB">
+<!ENTITY shadow-version "4.6">
+<!ENTITY shadow-size "1,639 KB">
 <!ENTITY shadow-url "https://github.com/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "c350da50c2120de6bb29177699d89fe3">
+<!ENTITY shadow-md5 "b491fecbf1232632c32ff8f1437fd60e">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/"> 
 <!ENTITY shadow-ch6-du "43 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
@@ -660,10 +660,10 @@
 <!ENTITY texinfo-ch6-du "128 MB">
 <!ENTITY texinfo-ch6-sbu "1.1 SBU">
 
-<!ENTITY tzdata-version "2018d">
-<!ENTITY tzdata-size "344 KB">
+<!ENTITY tzdata-version "2018e">
+<!ENTITY tzdata-size "346 KB">
 <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "871a7ef808eb42ebc551acdb3d661554">
+<!ENTITY tzdata-md5 "97d654f4d7253173b3eeb76a836dd65e">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
 <!ENTITY udev-lfs-version "udev-lfs-20171102">
@@ -701,10 +701,10 @@
 <!ENTITY xml-parser-ch6-du "2.1 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.2.3">
-<!ENTITY xz-size "1009 KB">
+<!ENTITY xz-version "5.2.4">
+<!ENTITY xz-size "1030 KB">
 <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "60fb79cab777e3f71ca43d298adacbd5">
+<!ENTITY xz-md5 "003e4d0b1b1899fc6e3000b24feddf7c">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-ch5-du "17 MB">
 <!ENTITY xz-ch5-sbu "0.2 SBU">