diff --git a/Makefile b/Makefile
index 3dacb1850..f237346a1 100644
--- a/Makefile
+++ b/Makefile
@@ -158,11 +158,11 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
 
-	#$(Q)xsltproc --nonet --xinclude                    \
-   #             --stringparam profile.revision $(REV) \
-   #             --output $(RENDERTMP)/sysd-wget.xml   \
-   #             stylesheets/lfs-xsl/profile.xsl       \
-   #             chapter03/chapter03.xml
+#	$(Q)xsltproc --nonet --xinclude                    \
+#                --stringparam profile.revision $(REV) \
+#                --output $(RENDERTMP)/sysd-wget.xml   \
+#                stylesheets/lfs-xsl/profile.xsl       \
+#                chapter03/chapter03.xml
 
 	$(Q)xsltproc --xinclude --nonet            \
                 --output $(BASEDIR)/wget-list \
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e536b9224..ad28fd8dd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-08-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Disable deprecated mpx code in gcc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="sysv">
       <para>2018-08-20</para>
       <itemizedlist>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index c1a074911..46d0d10c8 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -68,6 +68,7 @@ cd       build</userinput></screen>
              --enable-languages=c,c++ \
              --disable-multilib       \
              --disable-bootstrap      \
+             --disable-libmpx         \
              --with-system-zlib</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that
@@ -86,6 +87,15 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
  
+      <varlistentry>
+        <term><parameter>--disable-libmpx</parameter></term>
+        <listitem>
+          <para>This switch tells GCC to not build mpx (Memory Protection
+          Extensions) that can cause problems on some processors. It has
+          been removed from the next version of gcc.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-system-zlib</parameter></term>
         <listitem>