9 files changed, 16 insertions, 29 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9cfdaca70..638a06e1d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,10 @@
       <para>2012-07-13</para>
       <itemizedlist>
          <listitem>
+           <para>[matthew] - Upgrade to MPFR-3.1.1. Fixes
+           <ulink url="&lfs-ticket-root;3133">#3133</ulink>.</para>
+         </listitem>
+         <listitem>
            <para>[matthew] - Upgrade to Grep-2.13. Fixes
            <ulink url="&lfs-ticket-root;3132">#3132</ulink>.</para>
          </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 29bf3024a..2879ddb30 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -145,9 +145,9 @@
     <!--<listitem>
       <para>MPC &mpc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>MPFR &mpfr-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
@@ -297,6 +297,10 @@
     </listitem>
 
     <listitem>
+      <para>mpfr-3.1.0-fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>perl-5.14.2-libc-1.patch</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4a39be9a7..1043fc5aa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -116,14 +116,6 @@
     </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>
         <para>Download: <ulink url="&patches-root;&patch-test-patch;"/></para>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 12d6d48b4..180cdf7ae 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -55,7 +55,7 @@
     directory and then change to the directory created.  Only then should you
     proceed with the instructions below.</para></note>
 
-<screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
+<screen><userinput remap="pre">tar -Jxf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
 tar -Jxf ../gmp-&gmp-version;.tar.xz
 mv -v gmp-&gmp-version; gmp
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6ae16a588..ee09e026c 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -90,7 +90,7 @@ done</userinput></screen>
     packages. Unpack the tarballs and move them into the required directory
     names:</para>
 
-<screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
+<screen><userinput remap="pre">tar -Jxf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
 tar -Jxf ../gmp-&gmp-version;.tar.xz
 mv -v gmp-&gmp-version; gmp
diff --git a/chapter05/mpfr.xml b/chapter05/mpfr.xml
index b7e049d16..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 that fixes a number of bugs in MPFR-&mpfr-version;</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 b4a6cd28d..00bb8e164 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 that fixes a number of bugs in MPFR-&mpfr-version;</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/packages.ent b/packages.ent
index 4a70e2db5..f1fdb2be1 100644
--- a/packages.ent
+++ b/packages.ent
@@ -389,10 +389,10 @@
 <!ENTITY mpc-ch6-du "10.5 MB">
 <!ENTITY mpc-ch6-sbu "0.3 SBU">
 
-<!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 "238ae4a15cc3a5049b723daef5d17938">
+<!ENTITY mpfr-version "3.1.1">
+<!ENTITY mpfr-size "1,047 KB">
+<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
+<!ENTITY mpfr-md5 "91d51c41fcf2799e4ee7a7126fc95c17">
 <!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 03d2829cb..7caee45ea 100644
--- a/patches.ent
+++ b/patches.ent
@@ -70,11 +70,6 @@
 <!ENTITY kmod-testsuite-patch-size "2.2 KB">
 
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
-<!ENTITY mpfr-fixes-patch-md5 "6a1a0be6f2326e237ce27a0254e360a5">
-<!ENTITY mpfr-fixes-patch-size "17 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">