diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.8-gompi-2020.eb b/Golden_Repo/f/FFTW/FFTW-3.3.8-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5348a7fe8ffe54ecc9c551c3cae8dfb5c035e94f
--- /dev/null
+++ b/Golden_Repo/f/FFTW/FFTW-3.3.8-gompi-2020.eb
@@ -0,0 +1,36 @@
+name = 'FFTW'
+version = '3.3.8'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW 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."""
+
+site_contacts = 'i.gutheil@fz-juelich.de'
+
+toolchain = {'name': 'gompi', 'version': '2020'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303']
+
+# no quad precision, requires GCC v4.6 or higher
+# see also
+# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+with_quad_prec = True
+
+# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
+# because Intel compilers do not support FMA4 instructions
+use_fma4 = True
+
+# can't find mpirun/mpiexec and fails
+# runtest = 'check'
+
+modextravars = {
+    'FFTW_ROOT': '%(installdir)s',
+    'FFTW_INCLUDE': '%(installdir)s/include',
+    'FFTW_LIB': '%(installdir)s/lib',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.8-iimpi-2020.eb b/Golden_Repo/f/FFTW/FFTW-3.3.8-iimpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..16668a684c08f769962a6478232e9ac832043456
--- /dev/null
+++ b/Golden_Repo/f/FFTW/FFTW-3.3.8-iimpi-2020.eb
@@ -0,0 +1,42 @@
+name = 'FFTW'
+version = '3.3.8'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW 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."""
+
+site_contacts = 'i.gutheil@fz-juelich.de'
+
+toolchain = {'name': 'iimpi', 'version': '2020'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# See https://github.com/FFTW/fftw3/commit/10e2040af822a08ed49d2f6a1db45a7a3ad50582
+patches = ['fftw_no-gcc-intel_2020.patch']
+
+checksums = [
+    '6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303',
+    'f226cc6dbdc9d11d4340567ef3227d78284c4dc44b8e63c3901a079aa9527da6'
+]
+
+# no quad precision, requires GCC v4.6 or higher
+# see also
+# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+with_quad_prec = False
+
+# Intel compilers do not support FMA4 instructions
+use_fma4 = False
+
+# can't find mpirun/mpiexec and fails
+# runtest = 'check'
+
+modextravars = {
+    'FFTW_ROOT': '%(installdir)s',
+    'FFTW_INCLUDE': '%(installdir)s/include',
+    'FFTW_LIB': '%(installdir)s/lib',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.8-iompi-2020.eb b/Golden_Repo/f/FFTW/FFTW-3.3.8-iompi-2020.eb
index d48e109f0c80921c206e92aa048a156b8cd11be0..afd7ab7024c00636f61c07fa743eeb09b894bdfc 100644
--- a/Golden_Repo/f/FFTW/FFTW-3.3.8-iompi-2020.eb
+++ b/Golden_Repo/f/FFTW/FFTW-3.3.8-iompi-2020.eb
@@ -27,8 +27,7 @@ checksums = [
 # http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
 with_quad_prec = False
 
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
+# Intel compilers do not support FMA4 instructions
 use_fma4 = False
 
 # can't find mpirun/mpiexec and fails
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.8-ipsmpi-2020.eb b/Golden_Repo/f/FFTW/FFTW-3.3.8-ipsmpi-2020.eb
index 9da9748a49269114cbf65466fcbc152a8b6a7eb7..1ccf3952789b9807eaee57cd20c5bb3f10f04f32 100644
--- a/Golden_Repo/f/FFTW/FFTW-3.3.8-ipsmpi-2020.eb
+++ b/Golden_Repo/f/FFTW/FFTW-3.3.8-ipsmpi-2020.eb
@@ -27,8 +27,7 @@ checksums = [
 # http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
 with_quad_prec = False
 
-# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
-# because Intel compilers do not support FMA4 instructions
+# Intel compilers do not support FMA4 instructions
 use_fma4 = False
 
 # can't find mpirun/mpiexec and fails
diff --git a/Golden_Repo/jusuf_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb b/Golden_Repo/jusuf_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..edef15b1e9d240917a98d3aa3761e126b43eec31
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb
@@ -0,0 +1,36 @@
+name = 'FFTW'
+version = '3.3.8'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW 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."""
+
+site_contacts = 'i.gutheil@fz-juelich.de'
+
+toolchain = {'name': 'gompi', 'version': '2020'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303']
+
+# no quad precision, requires GCC v4.6 or higher
+# see also
+# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+with_quad_prec = True
+
+# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
+# because AMD zen processors do not support FMA4 instructions
+use_fma4 = False
+
+# can't find mpirun/mpiexec and fails
+# runtest = 'check'
+
+modextravars = {
+    'FFTW_ROOT': '%(installdir)s',
+    'FFTW_INCLUDE': '%(installdir)s/include',
+    'FFTW_LIB': '%(installdir)s/lib',
+}
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/juwelsbooster_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb b/Golden_Repo/juwelsbooster_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..edef15b1e9d240917a98d3aa3761e126b43eec31
--- /dev/null
+++ b/Golden_Repo/juwelsbooster_overlay/f/FFTW/FFTW-3.3.8-gompi-2020.eb
@@ -0,0 +1,36 @@
+name = 'FFTW'
+version = '3.3.8'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW 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."""
+
+site_contacts = 'i.gutheil@fz-juelich.de'
+
+toolchain = {'name': 'gompi', 'version': '2020'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303']
+
+# no quad precision, requires GCC v4.6 or higher
+# see also
+# http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+with_quad_prec = True
+
+# compilation fails on AMD systems when configuring with --enable-avx-128-fma,
+# because AMD zen processors do not support FMA4 instructions
+use_fma4 = False
+
+# can't find mpirun/mpiexec and fails
+# runtest = 'check'
+
+modextravars = {
+    'FFTW_ROOT': '%(installdir)s',
+    'FFTW_INCLUDE': '%(installdir)s/include',
+    'FFTW_LIB': '%(installdir)s/lib',
+}
+
+moduleclass = 'numlib'