diff --git a/fftw3.changes b/fftw3.changes
index 3f08939..2864055 100644
--- a/fftw3.changes
+++ b/fftw3.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 16 17:07:05 CEST 2007 - tiwai@suse.de
+
+- follow library packaging policy
+  * move docs to devel package
+  * remove static libraries
+
 -------------------------------------------------------------------
 Sat Oct 21 15:50:52 CEST 2006 - schwab@suse.de
 
diff --git a/fftw3.spec b/fftw3.spec
index d67d123..b6fee8d 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fftw3 (Version 3.1.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,8 +14,8 @@ Name:           fftw3
 BuildRequires:  gcc-fortran pkgconfig
 Summary:        Discrete Fourier Transform (DFT) C Subroutine Library
 Version:        3.1.2
-Release:        10
-License:        GNU General Public License (GPL) - all versions
+Release:        31
+License:        GNU General Public License (GPL)
 Group:          Productivity/Scientific/Math
 Source:         fftw-%{version}.tar.bz2
 Patch:          fftw-%{version}.diff
@@ -90,20 +90,24 @@ Authors:
 %prep
 %setup -q -n fftw-%{version}
 %patch
-
-%build
 %{?suse_update_config:%{suse_update_config -f }}
 autoreconf --force --install
-%configure --enable-shared --enable-threads
-make
+
+%build
+%configure --enable-shared --enable-threads --disable-static
+make %{?jobs:-j %jobs}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
+# remove unneeded files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
 # hack to also compile/install single-precision version:
 make distclean
-%configure --enable-shared --enable-threads --enable-float
-make
+%configure --enable-shared --enable-threads --enable-float --disable-static
+make %{?jobs:-j %jobs}
 make DESTDIR=$RPM_BUILD_ROOT install
+# remove unneeded files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
 # gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*.info*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -130,24 +134,20 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL NEWS README TODO
-%doc doc/*
 %{_libdir}/libfftw3.so.*
 %{_libdir}/libfftw3f.so.*
 
 %files devel
 %defattr(-,root,root)
+%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL NEWS README TODO
+%doc doc/*
+%doc %{_mandir}/man?/*
 %{_infodir}/*.info*
 %{_includedir}/*
-%{_libdir}/libfftw3.a
-%{_libdir}/libfftw3f.a
-%{_libdir}/libfftw3.la
-%{_libdir}/libfftw3f.la
 %{_libdir}/libfftw3.so
 %{_libdir}/libfftw3f.so
 %{_libdir}/pkgconfig/*.pc
 %{_bindir}/*
-%{_mandir}/man?/*
 
 %files threads
 %defattr(-,root,root)
@@ -156,14 +156,14 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 
 %files threads-devel
 %defattr(-,root,root)
-%{_libdir}/libfftw3_threads.a
-%{_libdir}/libfftw3f_threads.a
-%{_libdir}/libfftw3_threads.la
-%{_libdir}/libfftw3f_threads.la
 %{_libdir}/libfftw3_threads.so
 %{_libdir}/libfftw3f_threads.so
 
-%changelog -n fftw3
+%changelog
+* Mon Apr 16 2007 - tiwai@suse.de
+- follow library packaging policy
+  * move docs to devel package
+  * remove static libraries
 * Sat Oct 21 2006 - schwab@suse.de
 - Fix broken macro.
 * Tue Aug 22 2006 - tiwai@suse.de