diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index a1993a8c4..3b1de5a4c 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 136896 2011-09-02 17:27:59Z ronald $
+# $Id$
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
-# ALARM: Kevin Mihelich <kevin@plugapps.com>
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed -malign-double from CFLAGS
 #  - removed --enable-sse2 from double precision
 #  - removed --enable-sse from single precision
 
-plugrel=1
-
 pkgname=fftw
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64')
@@ -21,7 +19,7 @@ makedepends=('gcc-fortran')
 options=('!libtool')
 source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
 install=fftw.install
-sha1sums=('11a8c31186ff5a7d686a79a3f21b2530888e0dc2')
+sha1sums=('11487180928d05746d431ebe7a176b52fe205cf9')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
@@ -30,28 +28,42 @@ sha1sums=('11a8c31186ff5a7d686a79a3f21b2530888e0dc2')
 
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}
+  
+  cp -a ${pkgname}-${pkgver} ${pkgname}-${pkgver}-double
+  cp -a ${pkgname}-${pkgver} ${pkgname}-${pkgver}-long-double
+  mv ${pkgname}-${pkgver} ${pkgname}-${pkgver}-single
+  
 
   # use upstream default CFLAGS while keeping our -march/-mtune
   CFLAGS+=" -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math"
 
   CONFIGURE="./configure F77=gfortran --prefix=/usr \
-                 --enable-shared --enable-threads --enable-type-prefix"
+                 --enable-shared --enable-threads"
 
-  # build & install double precision
+  # build double precision
+  cd ${srcdir}/${pkgname}-${pkgver}-double
   $CONFIGURE
   make
-  make DESTDIR=${pkgdir} install
-  make clean 
 
   # build & install long double precission
+  cd ${srcdir}/${pkgname}-${pkgver}-long-double
   $CONFIGURE --enable-long-double
   make
-  make DESTDIR=${pkgdir} install
-  make clean
 
   # build & install single precision
+  cd ${srcdir}/${pkgname}-${pkgver}-single
   $CONFIGURE --enable-float
   make
-  make DESTDIR=${pkgdir} install
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}-double
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/${pkgname}-${pkgver}-long-double
+  make DESTDIR=${pkgdir} install
+
+  cd ${srcdir}/${pkgname}-${pkgver}-single
+  make DESTDIR=${pkgdir} install  
 }
diff --git a/extra/fftw/fftw.install b/extra/fftw/fftw.install
index a3748aae1..b2b22ac67 100644
--- a/extra/fftw/fftw.install
+++ b/extra/fftw/fftw.install
@@ -2,6 +2,7 @@ info_dir=/usr/share/info
 info_files=(fftw3.info)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done