diff --git a/.cvsignore b/.cvsignore
index 1f5e945..783cce2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fftw-3.2.1.tar.gz
+fftw-3.2.2.tar.gz
diff --git a/fftw.spec b/fftw.spec
index f602669..9432b5e 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -1,16 +1,16 @@
 Name:           fftw
-Version:        3.2.1
-Release:        3%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.fftw.org/
-Source0:        ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz
+Source0:        http://www.fftw.org/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
+Requires(post): info 
+Requires(preun): info
 
 Provides:       fftw3 = %{version}-%{release}
 Obsoletes:      fftw3 < 3.1
@@ -52,12 +52,16 @@ the FFTW fast Fourier transform library.
 
 %prep
 %setup -q -c %{name}-%{version}
-mv %{name}-%{version} single
-cp -a single double
-cp -a single long
+for dir in single double long; do
+  cp -a fftw-%{version} $dir
+done
+rm -rf fftw-%{version}
 
 
 %build
+# Configure uses g77 by default
+export F77=gfortran
+
 CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
 pushd double
 	%configure $CONFIG_FLAGS
@@ -87,6 +91,7 @@ pushd long
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+find ${RPM_BUILD_ROOT}%{_libdir} -name *.la -delete
 
 
 %clean
@@ -111,25 +116,29 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
-%doc %{_mandir}/man?/*
-%{_bindir}/*
-%{_libdir}/*.so.*
+%doc %{_mandir}/man1/fftw*.1.*
+%{_bindir}/fftw*-wisdom*
+%{_libdir}/libfftw3*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
-%doc %{_infodir}/*.info*
-%{_includedir}/*
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
+%doc %{_infodir}/fftw3.info*
+%{_includedir}/fftw3.*
+%{_libdir}/pkgconfig/fftw3*.pc
+%{_libdir}/libfftw3*.so
 
 %files static
 %defattr(-,root,root,-)
-%exclude %{_libdir}/*.la
-%{_libdir}/*.a
+%{_libdir}/libfftw3*.a
 
 
 %changelog
+* Fri Jan 1 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 3.2.2-1
+- Update to 3.2.2.
+- Make file listings more explicit.
+- Don't use file dependencies for info.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 976f94f..798bd7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-712d3f33625a0a76f5758648d4b925f7  fftw-3.2.1.tar.gz
+b616e5c91218cc778b5aa735fefb61ae  fftw-3.2.2.tar.gz