diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6d5aeb5e1..4b19531d6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,32 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+   <listitem>
+      <para>2016-06-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.43.1. Fixes
+          <ulink url="&lfs-ticket-root;3942">#3942</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.6.2. Fixes
+          <ulink url="&lfs-ticket-root;3940">#3940</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.8. Fixes
+          <ulink url="&lfs-ticket-root;3943">#3943</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to eudev-3.2. Fixes
+          <ulink url="&lfs-ticket-root;3939">#3939</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add make-4.2-upstream_fixes-1.patch. Fixes
+          <ulink url="&lfs-ticket-root;3941">#3941</ulink>.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
    <listitem>
       <para>2016-05-27</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 118e30d07..0f4fc503c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -65,9 +65,9 @@
     <!--<listitem>
       <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>
     </listitem>
@@ -95,9 +95,9 @@
     <listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
@@ -259,6 +259,10 @@
       <para>&glibc-upstream-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&make-upstream-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2228819aa..e3a891f68 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -82,6 +82,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Make Upstream Patch - <token>&make-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&make-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&make-upstream-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 22b5afb4e..f03c55c6d 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -42,6 +42,9 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
+    <para>Fix some problems identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream-patch;</userinput></screen>
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools --without-guile</userinput></screen>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 791908683..86fe7e19b 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,6 +40,9 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
+    <para>Fix some problems identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream-patch;</userinput></screen>
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 5815ef135..a12baa8a3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -135,18 +135,18 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.43">
-<!ENTITY e2fsprogs-size "6,856 KB">
+<!ENTITY e2fsprogs-version "1.43.1">
+<!ENTITY e2fsprogs-size "6,846 KB">
 <!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "83f3256fcf37dd6dd4acbb648a30625a">
+<!ENTITY e2fsprogs-md5 "1775f3f0eed9dee1c5f39e08d1964a97">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "48 MB">
 <!ENTITY e2fsprogs-ch6-sbu "2.7 SBU">
 
-<!ENTITY eudev-version "3.1.5">
-<!ENTITY eudev-size "1,705 KB">
+<!ENTITY eudev-version "3.2">
+<!ENTITY eudev-size "1,744 KB">
 <!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "c4dace42deecede102b6c01904042acc">
+<!ENTITY eudev-md5 "7e42d9b9ed8162021665139520676367">
 <!ENTITY eudev-ch6-du "79 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
 
@@ -228,10 +228,10 @@
 <!ENTITY gdbm-ch6-du "9.0 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.7">
-<!ENTITY gettext-size "7,019 KB">
+<!ENTITY gettext-version "0.19.8">
+<!ENTITY gettext-size "6,970 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "f81e50556da41b44c1d59ac93474dca5">
+<!ENTITY gettext-md5 "3e7ed1ac886b9b1a4e23e71113da6358">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "169 MB">
 <!ENTITY gettext-ch5-sbu "0.9 SBU">
@@ -391,12 +391,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "0">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "87,365 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "87,376 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d2927020e24a76da4ab482a8bc3e9ef3">
+<!ENTITY linux-md5 "70c4571bfb7ce7ccb14ff43b50165d43">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
diff --git a/patches.ent b/patches.ent
index b150d8c67..c4f40384f 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,6 +34,10 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY make-upstream-patch "make-&make-version;-upstream_fixes-1.patch">
+<!ENTITY make-upstream-patch-md5 "992c1719864ec6d75f14de07844c82ec">
+<!ENTITY make-upstream-patch-size "6.9 KB">
+
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
 <!ENTITY readline-fixes-patch-size "8 KB">