diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b11b53c6d..8671050be 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
     <listitem>
       <para>2014-04-18</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added mpfr upstream patch. Fixes 
+          <ulink url="&lfs-ticket-root;3537">#3537</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Added readline upstream patch. Fixes 
           <ulink url="&lfs-ticket-root;3532">#3532</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e121a7ea1..9ac1cf26b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -253,6 +253,9 @@
     <listitem>
       <para>libcap-&libcap-version;</para>
     </listitem>
+    <listitem>
+      <para>&mpfr-fixes-patch;</para>
+    </listitem>
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6d7c0751a..6c5e5230d 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -66,6 +66,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Mpfr Upstream Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&mpfr-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 708101891..517baf755 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -41,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
 
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&mpfr-fixes-patch;</userinput></screen>
+
     <para>Prepare MPFR for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/patches.ent b/patches.ent
index 9dddd6a60..5e120dfb4 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,6 +26,10 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-1.patch">
+<!ENTITY mpfr-fixes-patch-md5 "aaf52416b309dd0b8c5eb92ae9c210c1">
+<!ENTITY mpfr-fixes-patch-size "43 KB">
+
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
 <!ENTITY perl-libc-patch-size "1.6 KB">