diff --git a/srcpkgs/fftw/fftw-devel.template b/srcpkgs/fftw/fftw-devel.template
index 759c63d416..d25f955176 100644
--- a/srcpkgs/fftw/fftw-devel.template
+++ b/srcpkgs/fftw/fftw-devel.template
@@ -1,14 +1,11 @@
 # Template file for 'fftw-devel'.
 #
-noarch=yes
 depends="libfftw>=${version}"
 short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
 
 do_install() {
-        vmove usr/include usr	
-        vmove usr/lib/pkgconfig usr/lib
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 	vmove usr/share/info usr/share
 }
diff --git a/srcpkgs/fftw/libfftw.template b/srcpkgs/fftw/libfftw.template
index 294e3f253c..f695a9043c 100644
--- a/srcpkgs/fftw/libfftw.template
+++ b/srcpkgs/fftw/libfftw.template
@@ -1,9 +1,6 @@
 # Template file for 'libfftw'.
 #
 short_desc="${short_desc} - Runtime library"
-long_desc="${long_desc}
-
- This package contains the FFTW runtime lib(s)."
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 97515eccb3..b258b9f0d8 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -1,7 +1,7 @@
 # Template file for 'fftw'
 pkgname=fftw
 version=3.3.3
-revision=1
+revision=2
 short_desc="Library for computing the discrete Fourier transform (DFT)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,15 +16,25 @@ long_desc="
  implementations, and is even competitive with vendor-tuned libraries."
 
 subpackages="libfftw fftw-devel"
-makedepends="gcc-fortran"
+hostmakedepends="automake gcc-fortran"
+
+pre_configure() {
+	sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
+	autoreconf -fi
+}
 
 do_configure() {
-	local CARGS="--disable-static --enable-shared --enable-threads"
+	local CARGS="--enable-shared --enable-threads"
+
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		_sse="--enable-sse"
+		_sse2="--enable-sse2"
+	fi
 
 	# double precision
 	mkdir build-double
 	cd ${wrksrc}/build-double && \
-		../configure ${CONFIGURE_SHARED_ARGS} ${CARGS} --enable-sse2
+		../configure ${CONFIGURE_SHARED_ARGS} ${CARGS} ${_sse2}
 
 	# long double precission
 	mkdir ${wrksrc}/build-long-double
@@ -36,7 +46,7 @@ do_configure() {
 	mkdir ${wrksrc}/build-single
 	cd ${wrksrc}/build-single && \
 		../configure ${CONFIGURE_SHARED_ARGS} ${CARGS} \
-		--enable-float --enable-sse
+		--enable-float ${_sse}
 }
 
 do_build() {