diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 17abe580d..5b89066f0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-01-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mpfr-4.0.0.  Fixes
+          <ulink url="&lfs-ticket-root;4185">#4185</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mpc-1.1.0.  Fixes
+          <ulink url="&lfs-ticket-root;4196">#4196</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-01-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ce5d7beeb..2335ec703 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -173,9 +173,9 @@
     <listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>MPC-&mpc-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>MPFR-&mpfr-version;</para>
     </listitem>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 835c9691a..5a44725db 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -51,11 +51,9 @@ ln -sv bash /bin/sh</userinput></screen>
 ln -sv /tools/bin/{env,install,perl} /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 for lib in blkid lzma mount uuid
 do
     ln -sv /tools/lib/lib$lib.so* /usr/lib
-    sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la
 done
 ln -svf /tools/include/blkid    /usr/include
 ln -svf /tools/include/libmount /usr/include
@@ -68,6 +66,8 @@ do
 done
 ln -sv bash /bin/sh</userinput></screen>
 
+<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+   sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la-->
   <variablelist>
     <title>The purpose of each link:</title>
 
@@ -166,7 +166,7 @@ ln -sv bash /bin/sh</userinput></screen>
         for C++ support in GMP.</para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
       <listitem>
@@ -175,7 +175,7 @@ ln -sv bash /bin/sh</userinput></screen>
         <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry revision="systemd">
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
diff --git a/general.ent b/general.ent
index 9ef6f260c..b1bb755a1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180113">
+<!ENTITY version         "SVN-20180114">
 <!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        "20180113-systemd">
+<!ENTITY versiond        "20180114-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "January 13, 2018">
+<!ENTITY releasedate     "January 14, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.2">
diff --git a/packages.ent b/packages.ent
index e3bcdf8c5..d0924c873 100644
--- a/packages.ent
+++ b/packages.ent
@@ -478,18 +478,18 @@
 <!ENTITY meson-ch6-du "30 MB">
 <!ENTITY meson-ch6-sbu "0.4 SBU">
 
-<!ENTITY mpc-version "1.0.3">
-<!ENTITY mpc-size "655 KB">
-<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "d6a1d5f8ddea3abd2cc3e98f58352d26">
+<!ENTITY mpc-version "1.1.0">
+<!ENTITY mpc-size "685 KB">
+<!ENTITY mpc-url "https://ftp.gnu.org/gnu/mpc/mpc-&mpc-version;.tar.gz">
+<!ENTITY mpc-md5 "4125404e41e482ec68282a2e687f6c73">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 <!ENTITY mpc-ch6-du "17 MB">
 <!ENTITY mpc-ch6-sbu "0.3 SBU">
 
-<!ENTITY mpfr-version "3.1.6">
-<!ENTITY mpfr-size "1,108 KB">
+<!ENTITY mpfr-version "4.0.0">
+<!ENTITY mpfr-size "1,374 KB">
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
-<!ENTITY mpfr-md5 "51bfdbf81553966c8d43808122cc81b3">
+<!ENTITY mpfr-md5 "94c67b3cfbee10605a5e59d0ed9161db">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch6-du "45 MB">
 <!ENTITY mpfr-ch6-sbu "0.8 SBU">