diff --git a/.cvsignore b/.cvsignore
index 988d1db..7948862 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-gmp-4.1.3.tar.bz2
-gmp-4.1.4.tar.bz2
+gmp-4.2.1.tar.bz2
diff --git a/gmp.spec b/gmp.spec
index b017c6c..d1c57bd 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -7,18 +7,16 @@
 
 Summary: A GNU arbitrary precision library.
 Name: gmp
-Version: 4.1.4
-Release: 6.2.1
+Version: 4.2.1
+Release: 1
 URL: http://www.swox.com/gmp/
 Source: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Patch0: gmp-4.0.1-s390.patch
-Patch1: gmp-4.1.2-ppc64.patch
 Patch2: gmp-4.1.2-autoconf.patch
-Patch3: gmp-4.1.4-fpu.patch
 License: LGPL 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake16 autoconf libtool
+BuildRequires: libtool
 
 %description
 The gmp package contains GNU MP, a library for arbitrary precision
@@ -35,7 +33,7 @@ library.
 %package devel
 Summary: Development tools for the GNU MP arbitrary precision library.
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 PreReq: /sbin/install-info
 
 %description devel
@@ -49,24 +47,17 @@ install the gmp package.
 %prep
 %setup -q
 %patch0 -p1
-#patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .fpu
-
-libtoolize --force
-aclocal-1.6 -I mpn -I mpfr
-automake-1.6
-autoconf
 
 %build
 if as --help | grep -q execstack; then
   # the object files do not require an executable stack
   export CCAS="gcc -c -Wa,--noexecstack"
 fi
-mkdir base
-cd base
+mkdir build
+cd build
 ln -s ../configure .
-%configure --enable-mpbsd --enable-mpfr --enable-cxx
+%configure --enable-mpbsd --disable-mpfr --enable-cxx
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -76,7 +67,7 @@ mkdir build-sse2
 cd build-sse2
 ln -s ../configure .
 CFLAGS="-O2 -g -march=pentium4"
-%configure --enable-mpbsd --enable-mpfr --enable-cxx pentium4-redhat-linux
+%configure --enable-mpbsd --disable-mpfr --enable-cxx pentium4-redhat-linux
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -85,7 +76,7 @@ cd ..
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-cd base
+cd build
 export LD_LIBRARY_PATH=`pwd`/.libs
 %{makeinstall}
 install -m 644 gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}
@@ -112,7 +103,7 @@ cd ..
 
 %check
 %ifnarch ppc
-cd base
+cd build
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags} check
 cd ..
@@ -129,11 +120,11 @@ cd ..
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gmp.info.gz %{_infodir}/dir
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gmp.info.*
 
 %preun devel
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/gmp.info.gz %{_infodir}/dir
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gmp.info.*
 fi
 
 %clean
@@ -146,7 +137,7 @@ fi
 %{_libdir}/libmp.so.*
 %{_libdir}/libgmpxx.so.*
 %ifarch %{ix86}
-%{_libdir}/sse2/*
+%{_libdir}/sse2/libgmp*
 %endif
 
 %files devel
@@ -157,12 +148,14 @@ fi
 %{_libdir}/libmp.a
 %{_libdir}/libgmp.a
 %{_libdir}/libgmpxx.a
-%{_libdir}/libmpfr.a
 %{_includedir}/*.h
 %{_infodir}/gmp.info*
-%{_infodir}/mpfr.info*
 
 %changelog
+* Thu Jun  8 2006 Thomas Woerner <twoerner@redhat.com> 4.2.1-1
+- new version 4.2.1
+- mpfr moved out of gmp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 4.1.4-6.2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index 984c302..1da57d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0aa7d3b3f5b5ec5951e7dddd6f65e891  gmp-4.1.4.tar.bz2
+091c56e0e1cca6b09b17b69d47ef18e3  gmp-4.2.1.tar.bz2