diff --git a/easybuild/easyconfigs/b/buildenv/buildenv-default-Fujitsu-21.05.eb b/easybuild/easyconfigs/b/buildenv/buildenv-default-Fujitsu-21.05.eb
new file mode 100644
index 00000000000..7e62992365c
--- /dev/null
+++ b/easybuild/easyconfigs/b/buildenv/buildenv-default-Fujitsu-21.05.eb
@@ -0,0 +1,13 @@
+easyblock = 'BuildEnv'
+
+name = 'buildenv'
+version = 'default'
+
+homepage = 'None'
+description = """This module sets a group of environment variables for compilers, linkers, maths libraries, etc., that
+ you can use to easily transition between toolchains when building your software. To query the variables being set
+ please use: module show <this module name>"""
+
+toolchain = {'name': 'Fujitsu', 'version': '21.05'}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/f/Fujitsu/Fujitsu-21.05.eb b/easybuild/easyconfigs/f/Fujitsu/Fujitsu-21.05.eb
new file mode 100644
index 00000000000..f11cf3c5c1e
--- /dev/null
+++ b/easybuild/easyconfigs/f/Fujitsu/Fujitsu-21.05.eb
@@ -0,0 +1,21 @@
+easyblock = 'Toolchain'
+
+name = 'Fujitsu'
+version = '21.05'
+
+homepage = '(none)'
+description = """Toolchain using Fujitsu compilers and libraries."""
+
+toolchain = SYSTEM
+
+local_fccver = '4.5.0'
+local_comp_tc = ('FCC', local_fccver)
+local_comp_mpi_tc = ('ffmpi', local_fccver)
+
+dependencies = [
+    # Fujitsu's fork of FFTW doesn't seem to support MPI yet (mpi tests fail)
+    # ('FFTW', '1.0.0', '-fujitsu', local_comp_mpi_tc),
+    ('FFTW', '1.0.0', '-fujitsu', local_comp_tc)
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.3-Fujitsu-21.05.eb b/easybuild/easyconfigs/h/HPL/HPL-2.3-Fujitsu-21.05.eb
new file mode 100644
index 00000000000..e6a43addd5f
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.3-Fujitsu-21.05.eb
@@ -0,0 +1,21 @@
+name = 'HPL'
+version = '2.3'
+
+homepage = 'https://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits)
+ arithmetic on distributed-memory computers. It can thus be regarded as a portable as well as freely available
+ implementation of the High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'Fujitsu', 'version': '21.05'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+source_urls = ['https://www.netlib.org/benchmark/%(namelower)s']
+sources = [SOURCELOWER_TAR_GZ]
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+checksums = [
+    '32c5c17d22330e6f2337b681aded51637fb6008d3f0eb7c277b163fadd612830',  # hpl-2.3.tar.gz
+    '2a5bf9c4f328049828ddecec7ba3f05a9e25d236f4212747c53bd22fea80c5e6',  # HPL_parallel-make.patch
+]
+
+moduleclass = 'tools'