diff --git a/fftw.spec b/fftw.spec
index aa559d2..a011a60 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -46,9 +46,22 @@ Provides:       fftw3 = %{version}-%{release}
 Obsoletes:      fftw3 < 3.3
 # Libs branched from rpm containing binaries in version 3.3
 Obsoletes:      fftw < 3.3
+# Libs rearranged in 3.3.1-2
+Obsoletes:	fftw-libs-threads < %{version}-%{release}
+Obsoletes:	fftw-libs-openmp < %{version}-%{release}
+
+# Pull in the actual libraries
+Requires:	 %{name}-libs-single%{?_isa} = %{version}-%{release}
+Requires:	 %{name}-libs-double%{?_isa} = %{version}-%{release}
+Requires:	 %{name}-libs-long%{?_isa} = %{version}-%{release}
+%if %{quad}
+Requires:	 %{name}-libs-quad%{?_isa} = %{version}-%{release}
+%endif
 
 %description libs
-This package contains the FFTW run-time libraries.
+This is a dummy package package, pulling in the individual FFTW
+run-time libraries.
+
 
 %package devel
 Summary:        Headers, libraries and docs for the FFTW library
@@ -56,10 +69,6 @@ Group:          Development/Libraries
 Requires:       pkgconfig
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       %{name}-libs-threads%{?_isa} = %{version}-%{release}
-%if %{openmp}
-Requires:       %{name}-libs-openmp%{?_isa} = %{version}-%{release}
-%endif
 Provides:       fftw3-devel%{?_isa} = %{version}-%{release}
 Provides:       fftw3-devel = %{version}-%{release}
 Obsoletes:      fftw3-devel < 3.3
@@ -72,20 +81,36 @@ 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.
 
-%package libs-threads
-Summary:        FFTW library with threading support
+%package libs-double
+Summary:        FFTW library, double precision
 Group:          Development/Libraries
 
-%description libs-threads
-This package contains the FFTW library compiled with threading support.
+%description libs-double
+This package contains the FFTW library compiled in double precision.
 
-%if %{openmp}
-%package libs-openmp
-Summary:        FFTW library with OpenMP support
+%package libs-single
+Summary:        FFTW library, single precision
 Group:          Development/Libraries
 
-%description libs-openmp
-This package contains the FFTW library compiled with OpenMP support.
+%description libs-single
+This package contains the FFTW library compiled in single precision.
+
+%package libs-long
+Summary:        FFTW library, long double precision 
+Group:          Development/Libraries
+
+%description libs-long
+This package contains the FFTW library compiled in long double
+precision.
+
+%if %{quad}
+%package libs-quad
+Summary:        FFTW library, quadruple
+Group:          Development/Libraries
+
+%description libs-quad
+This package contains the FFTW library compiled in quadruple
+precision.
 %endif
 
 %package        static
@@ -185,13 +210,15 @@ done
 %clean
 rm -rf %{buildroot}
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-%post libs-threads -p /sbin/ldconfig
-%postun libs-threads -p /sbin/ldconfig
-%if %{openmp}
-%post libs-openmp -p /sbin/ldconfig
-%postun libs-openmp -p /sbin/ldconfig
+%post libs-single -p /sbin/ldconfig
+%postun libs-single -p /sbin/ldconfig
+%post libs-double -p /sbin/ldconfig
+%postun libs-double -p /sbin/ldconfig
+%post libs-long -p /sbin/ldconfig
+%postun libs-long -p /sbin/ldconfig
+%if %{quad}
+%post libs-quad -p /sbin/ldconfig
+%postun libs-quad -p /sbin/ldconfig
 %endif
 
 %post devel
@@ -209,34 +236,45 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
+
+%files libs-single
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%{_libdir}/libfftw3f.so.*
+%{_libdir}/libfftw3f_threads.so.*
+%if %{openmp}
+%{_libdir}/libfftw3f_omp.so.*
+%endif
+
+%files libs-double
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
 %{_libdir}/libfftw3.so.*
-%{_libdir}/libfftw3f.so.*
-%{_libdir}/libfftw3l.so.*
-%if %{quad}
-%{_libdir}/libfftw3q.so.*
+%{_libdir}/libfftw3_threads.so.*
+%if %{openmp}
+%{_libdir}/libfftw3_omp.so.*
 %endif
 
-%if %{openmp}
-%files libs-openmp
+%files libs-long
 %defattr(-,root,root,-)
-%{_libdir}/libfftw3_omp.so.*
-%{_libdir}/libfftw3f_omp.so.*
+%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%{_libdir}/libfftw3l.so.*
+%{_libdir}/libfftw3l_threads.so.*
+%if %{openmp}
 %{_libdir}/libfftw3l_omp.so.*
+%endif
+
 %if %{quad}
+%files libs-quad
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%{_libdir}/libfftw3q.so.*
+%{_libdir}/libfftw3q_threads.so.*
+%if %{openmp}
 %{_libdir}/libfftw3q_omp.so.*
 %endif
 %endif
 
-%files libs-threads
-%defattr(-,root,root,-)
-%{_libdir}/libfftw3_threads.so.*
-%{_libdir}/libfftw3f_threads.so.*
-%{_libdir}/libfftw3l_threads.so.*
-%if %{quad}
-%{_libdir}/libfftw3q_threads.so.*
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/FAQ/fftw-faq.html/
@@ -254,6 +292,9 @@ fi
 %{_libdir}/libfftw3*.a
 
 %changelog
+* Thu Apr 26 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 3.3.1-2
+- Reorganized libraries (BZ #812981).
+
 * Mon Feb 27 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 3.3.1-1
 - Update to 3.3.1.