diff --git a/fftw.spec b/fftw.spec
index 3d40d50..7a848f6 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -41,25 +41,13 @@ cp -a single double
 
 
 %build
+CONFIG_FLAGS="--enable-shared --disable-static --disable-dependency-tracking --enable-threads"
 pushd double
-	%ifarch i386
-		%configure \
-			--enable-shared \
-			--enable-threads \
-			--enable-i386-hacks
-	%else
-		%configure \
-			--enable-shared \
-			--enable-threads
-	%endif
+	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
 popd
 pushd single
-	%configure \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-threads \
-		--enable-float
+	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
 
@@ -74,6 +62,7 @@ popd
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 
 %clean
@@ -107,13 +96,16 @@ fi
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
-%exclude %{_infodir}/dir
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 13 2006 Quentin Spencer <qspencer@users.sf.net> 3.1-2
+- Rebuild for Fedora Extras 5.
+- Disable static libs.
+- Remove obsolete configure options.
+
 * Wed Feb  1 2006 Quentin Spencer <qspencer@users.sf.net> 3.1-1
 - Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file.
 - Add dist tag.