diff --git a/fftw3.changes b/fftw3.changes
index 09c2c50..381e59a 100644
--- a/fftw3.changes
+++ b/fftw3.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug  5 22:44:51 UTC 2011 - dhall@wustl.edu
+
+- specfile cleanup
+  * Remove authors from description
+  * use %makeinstall
+- fix devel and mpi-devel to include proper header files
+
 -------------------------------------------------------------------
 Wed Aug  3 13:58:49 UTC 2011 - dhall@wustl.edu
 
diff --git a/fftw3.spec b/fftw3.spec
index 6e63790..7bb7685 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -38,12 +38,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package devel
 License:        GPLv2+
 Summary:        Include Files and Libraries mandatory for Development
@@ -56,12 +50,6 @@ This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package threads
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -74,12 +62,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package threads-devel
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -93,12 +75,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package openmp
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -111,12 +87,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package openmp-devel
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -130,12 +100,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package mpi
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -149,12 +113,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %package mpi-devel
 License:        GPLv2+
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
@@ -169,12 +127,6 @@ Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
 
-
-Authors:
---------
-    Matteo Frigo <athena@fftw.org>
-    Stevenj G. Johnson <stevenj@alum.mit.edu>
-
 %prep
 %setup -q -n fftw-%{version}
 # %patch
@@ -182,17 +134,17 @@ Authors:
 
 %build
 %configure --enable-shared --enable-threads --enable-openmp --enable-mpi --disable-static
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 # 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 --enable-openmp --enable-mpi --disable-static
-make %{?jobs:-j %jobs}
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags}
+%makeinstall
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
 # gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*.info*
@@ -237,7 +189,7 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 %doc %{_mandir}/man?/*
 %{_infodir}/*.info*
-%{_includedir}/*
+%{_includedir}/fftw3.*
 %{_libdir}/libfftw3.so
 %{_libdir}/libfftw3f.so
 %{_libdir}/pkgconfig/*.pc
@@ -272,5 +224,6 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/libfftw3_mpi.so
 %{_libdir}/libfftw3f_mpi.so
+%{_includedir}/fftw3-mpi.*
 
 %changelog