diff --git a/science/mathematics/fftw3/actions.py b/science/mathematics/fftw3/actions.py
index 1f58e7c190..cc608e4609 100644
--- a/science/mathematics/fftw3/actions.py
+++ b/science/mathematics/fftw3/actions.py
@@ -9,14 +9,14 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir="fftw-%s" % get.srcVERSION()
+WorkDir="fftw-%s-pl1" % get.srcVERSION()
 
 def setup():
     autotools.autoreconf("-fi")
 
-    shelltools.copytree("../fftw-%s" % get.srcVERSION(), "../fftw-%s-double" % get.srcVERSION())
-    shelltools.copytree("../fftw-%s" % get.srcVERSION(), "../fftw-%s-long-double" % get.srcVERSION())
-    shelltools.copytree("../fftw-%s" % get.srcVERSION(), "../fftw-%s-quad" % get.srcVERSION())
+    shelltools.copytree("../fftw-%s-pl1" % get.srcVERSION(), "../fftw-%s-double" % get.srcVERSION())
+    shelltools.copytree("../fftw-%s-pl1" % get.srcVERSION(), "../fftw-%s-long-double" % get.srcVERSION())
+    shelltools.copytree("../fftw-%s-pl1" % get.srcVERSION(), "../fftw-%s-quad" % get.srcVERSION())
 
     autotools.configure("--enable-sse \
                          --enable-shared \
@@ -88,7 +88,7 @@ def install():
     shelltools.cd("../fftw-%s-quad" % get.srcVERSION())
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    shelltools.cd("../fftw-%s" % get.srcVERSION())
+    shelltools.cd("../fftw-%s-pl1" % get.srcVERSION())
 
     pisitools.dohtml("doc/html/*")
     pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README", "TODO", "CONVENTIONS")
diff --git a/science/mathematics/fftw3/pspec.xml b/science/mathematics/fftw3/pspec.xml
index a7825c4200..46ef8f2c61 100644
--- a/science/mathematics/fftw3/pspec.xml
+++ b/science/mathematics/fftw3/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>A library for computing the discrete Fourier transform (DFT)</Summary>
         <Description>fftw3 is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).</Description>
-        <Archive sha1sum="fd508bac8ac13b3a46152c54b7ac885b69734262" type="targz">http://www.fftw.org/fftw-3.3.4.tar.gz</Archive>
+        <Archive sha1sum="b7730928b6b420733a6fd08c18616bf8ae4f625d" type="targz">ftp://ftp.fftw.org/pub/fftw/fftw-3.3.6-pl1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>libgfortran</Dependency>
             <Dependency>libquadmath</Dependency>
@@ -48,6 +48,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-02-17</Date>
+            <Version>3.3.6</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2016-06-09</Date>
             <Version>3.3.4</Version>