diff --git a/ChangeLog b/ChangeLog
index 4034b820f574b582c40b3880d20978db6e552f80..ff02b607990050978917b43153b390e7f605c222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Update MPFR version in error message.
+
+	* configure: Regenerate.
+
 2006-11-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in (--with-mpfr-dir, --with-gmp-dir): Remove flags.
diff --git a/configure b/configure
index 6519af09c69cbfed8ed87baf55df4c9341f367f2..d76717ac833a695385ecda0da49750093ca6d6db 100755
--- a/configure
+++ b/configure
@@ -2392,7 +2392,7 @@ fi
 CFLAGS="$saved_CFLAGS"
 
 if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
-  { echo "configure: error: Building GCC requires GMP 4.1+ and MPFR 2.2+.
+  { echo "configure: error: Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective
 hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
diff --git a/configure.in b/configure.in
index f9d6bca3bc3272b1f6b0726b3bc85bf4229a5dbe..094e910131ecbfc5793026d32cae82c7246ad7cd 100644
--- a/configure.in
+++ b/configure.in
@@ -1130,7 +1130,7 @@ fi
 CFLAGS="$saved_CFLAGS"
 
 if test -d ${srcdir}/gcc && test x$have_gmp != xyes; then
-  AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2+.
+  AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
 Try the --with-gmp and/or --with-mpfr options to specify their locations.
 Copies of these libraries' source code can be found at their respective
 hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1ae8cb62f4798f9cb55a7854a9d352f8abbc1a9..6601a1d7c1db554adc1873ac2a5f795fa5da75a4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* doc/install.texi: Update recommended MPFR version.  Remove
+	obsolete reference to cumulative patch.
+
 2006-12-02  Lee Millward  <lee.millward@codesourcery.com>
 
 	PR c/27953
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 0fee98af02565c65933c8d3635b304c755a89979..ab2a9f29996ee6145602dd9b9091f554bdf3c82e 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -297,16 +297,14 @@ library search path, you will have to configure with the
 @option{--with-gmp} configure option.  See also
 @option{--with-gmp-lib} and @option{--with-gmp-include}.
 
-@item MPFR Library version 2.2 (or later)
+@item MPFR Library version 2.2.1 (or later)
 
 Necessary to build GCC.  It can be downloaded from
-@uref{http://www.mpfr.org/}.  If you're using version 2.2.0, You
-should also apply revision 16 (or later) of the cumulative patch from
-@uref{http://www.mpfr.org/mpfr-current/}.  The version of MPFR that is
-bundled with GMP 4.1.x contains numerous bugs.  Although GCC will
-appear to function with the buggy versions of MPFR, there are a few
-bugs that will not be fixed when using this version.  It is strongly
-recommended to upgrade to the recommended version of MPFR.
+@uref{http://www.mpfr.org/}.  The version of MPFR that is bundled with
+GMP 4.1.x contains numerous bugs.  Although GCC may appear to function
+with the buggy versions of MPFR, there are a few bugs that will not be
+fixed when using this version.  It is strongly recommended to upgrade
+to the recommended version of MPFR.
 
 The @option{--with-mpfr} configure option should be used if your MPFR
 Library is not installed in your default library search path.  See
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6159e46895e13800c9e2338c339eac1a8026cb57..381647a5bfb7b31a1d7aa02c16070ecc6dc54f2f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.dg/torture/builtin-sin-mpfr-1.c: Update MPFR comment.
+
 2006-12-02  Lee Millward  <lee.millward@codesourcery.com>
 
        PR c/27953
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c b/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
index 86396f5c46a709da61ad25932d783985f9099c69..35972870894156f46d577157a2e7d9286e18a764 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-sin-mpfr-1.c
@@ -1,7 +1,6 @@
 /* Version 2.2.0 of MPFR had bugs in sin rounding.  This test checks
    to see if that buggy version was installed.  The problem is fixed
-   in the MPFR cumulative patch http://www.mpfr.org/mpfr-current and
-   presumably later MPFR versions.
+   in version 2.2.1 and presumably later MPFR versions.
 
    Origin: Kaveh R. Ghazi 10/23/2006.  */