diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 46dc49f01..57b8e4d64 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-10-12</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to MPFR-3.1.0. Fixes
+          <ulink url="&lfs-ticket-root;2934">#2934</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Module-Init-Tools-3.16. Fixes
           <ulink url="&lfs-ticket-root;2882">#2882</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e22426ae2..6121d3f3a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -257,9 +257,6 @@
     <listitem>
       <para>&module-init-tools-man-patch;</para>
     </listitem>
-    <listitem>
-      <para>&mpfr-fixes-patch;</para>
-    </listitem>
     <listitem>
       <para>perl-5.14.1-libc-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 48bbc4034..234c75739 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -139,14 +139,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>MPFR 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>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 5d21228ef..eeeea3224 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -77,7 +77,9 @@ cd ../gcc-build</userinput></screen>
     --disable-libmudflap --disable-libssp \
     --disable-libgomp --disable-libquadmath \
     --disable-target-libiberty --disable-target-zlib \
-    --enable-languages=c --without-ppl --without-cloog</userinput></screen>
+    --enable-languages=c --without-ppl --without-cloog \
+    --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
+    --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 85c1a5763..e28f05af3 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -157,7 +157,9 @@ cd ../gcc-build</userinput></screen>
     --enable-__cxa_atexit --enable-languages=c,c++ \
     --disable-libstdcxx-pch --disable-multilib \
     --disable-bootstrap --disable-libgomp \
-    --without-ppl --without-cloog</userinput></screen>
+    --without-ppl --without-cloog \
+    --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
+    --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
diff --git a/chapter05/mpfr.xml b/chapter05/mpfr.xml
index fe37cae9d..004273828 100644
--- a/chapter05/mpfr.xml
+++ b/chapter05/mpfr.xml
@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
 
-    <para>Apply a patch to fix a few bugs in MPFR:</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=/tools --enable-thread-safe</userinput></screen>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index dc09f1a76..2bc943129 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
 
-    <para>Apply a patch to fix a few bugs in MPFR:</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 --enable-thread-safe \
diff --git a/packages.ent b/packages.ent
index 7291f89fa..70fff9541 100644
--- a/packages.ent
+++ b/packages.ent
@@ -393,10 +393,10 @@
 <!ENTITY mpc-ch6-du "10.5 MB">
 <!ENTITY mpc-ch6-sbu "0.3 SBU">
 
-<!ENTITY mpfr-version "3.0.1">
-<!ENTITY mpfr-size "1,127 KB">
+<!ENTITY mpfr-version "3.1.0">
+<!ENTITY mpfr-size "1,176 KB">
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.bz2">
-<!ENTITY mpfr-md5 "bfbecb2eacb6d48432ead5cfc3f7390a">
+<!ENTITY mpfr-md5 "238ae4a15cc3a5049b723daef5d17938">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch5-du "27.1 MB">
 <!ENTITY mpfr-ch5-sbu "1.0 SBU">
diff --git a/patches.ent b/patches.ent
index 4b696c4a5..5267d4239 100644
--- a/patches.ent
+++ b/patches.ent
@@ -75,11 +75,6 @@
 <!ENTITY module-init-tools-man-patch-size "44 KB">
 
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
-<!ENTITY mpfr-fixes-patch-md5 "66305450989c2633b9346900e9a5d9a3">
-<!ENTITY mpfr-fixes-patch-size "9 KB">
-
-
 <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
 <!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
 <!ENTITY patch-test-patch-size "1 KB">