diff --git a/.cvsignore b/.cvsignore
index 7b4ed59..8fa4f81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fftw-2.1.5.tar.gz
+fftw-3.1.tar.gz
diff --git a/fftw.spec b/fftw.spec
index 8bafbbe..3bdf5fb 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -1,23 +1,24 @@
 Name:           fftw
-Version:        2.1.5
-Release:        8
+Version:        3.1
+Release:        1%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.fftw.org/
-Source0:        ftp://ftp.fftw.org/pub/fftw/fftw-2.1.5.tar.gz
+Source0:        ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Obsoletes:      fftw3 < 3.1
+Provides:       fftw3 = %{version}-%{release}
 
 %description
-FFTW is a C subroutine library for computing the Discrete Fourier Transform
-(DFT) in one or more dimensions, of both real and complex data, and of
-arbitrary input size. We believe that FFTW, which is free software, should
-become the FFT library of choice for most applications. Our benchmarks,
-performed on on a variety of platforms, show that FFTW's performance is
-typically superior to that of other publicly available FFT software.
+FFTW is a C subroutine library for computing the Discrete Fourier
+Transform (DFT) in one or more dimensions, of both real and complex
+data, and of arbitrary input size.
 
 
 %package        devel
@@ -25,26 +26,22 @@ Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
+
 %description    devel
-FFTW is a C subroutine library for computing the Discrete Fourier Transform
-(DFT) in one or more dimensions, of both real and complex data, and of
-arbitrary input size. We believe that FFTW, which is free software, should
-become the FFT library of choice for most applications. Our benchmarks,
-performed on on a variety of platforms, show that FFTW's performance is
-typically superior to that of other publicly available FFT software.
+FFTW is a C subroutine library for computing the Discrete Fourier
+Transform (DFT) in one or more dimensions, of both real and complex
+data, and of arbitrary input size.
 
 This package contains header files and development libraries needed to
 develop programs using the FFTW fast Fourier transform library.
 
 
-
 %prep
 %setup -q -c %{name}-%{version}
 mv %{name}-%{version} single
 cp -a single double
 
 
-
 %build
 pushd double
 	%ifarch i386
@@ -69,51 +66,60 @@ pushd single
 popd
 
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 pushd double
 	make install DESTDIR=${RPM_BUILD_ROOT}
 	cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../
-	cp -a FAQ/fftw-faq.html/ doc/ ../
+	cp -a doc/ ../
 popd
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
-rm -f doc/Makefile*
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-
 %post -p /sbin/ldconfig
 
 
-
 %postun -p /sbin/ldconfig
 
 
+%post devel
+/sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
+
+%preun devel
+if [ "$1" = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
+fi
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%doc %{_mandir}/man?/*
+%{_bindir}/*
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc  doc/
+%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
-%{_infodir}/*
-
-
 
 %changelog
+* 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.
+
 * Mon May 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.5-8
 - BuildReq gcc-gfortran (#156490).
 
diff --git a/sources b/sources
index e16821d..1a79825 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d16a84f3ca02a785ef9eb36249ba433  fftw-2.1.5.tar.gz
+911515569a8abdc7dbb207d53f34e60b  fftw-3.1.tar.gz