diff --git a/i/iimpi/iimpi-2019.03-GCC-9.1.0-2.32.eb b/i/iimpi/iimpi-2019.03-GCC-9.1.0-2.32.eb
new file mode 100644
index 00000000..dd7d878e
--- /dev/null
+++ b/i/iimpi/iimpi-2019.03-GCC-9.1.0-2.32.eb
@@ -0,0 +1,24 @@
+# IT4Innovations 2019
+
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2019.03'
+versionsuffix = '-GCC-9.1.0-2.32'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+compver = '2019.4.227'
+suff = '-GCC-9.1.0-2.32'
+dependencies = [
+    ('icc', compver, suff),
+    ('ifort', compver, suff),
+    ('impi', '2019.3.199', '', ('iccifort', '%s%s' % (compver, suff))),
+]
+
+modluafooter = 'add_property("state","experimental")'
+
+moduleclass = 'toolchain'
diff --git a/i/imkl/imkl-2019.3.199-iimpi-2019.03-GCC-9.1.0-2.32.eb b/i/imkl/imkl-2019.3.199-iimpi-2019.03-GCC-9.1.0-2.32.eb
new file mode 100644
index 00000000..bc99eb69
--- /dev/null
+++ b/i/imkl/imkl-2019.3.199-iimpi-2019.03-GCC-9.1.0-2.32.eb
@@ -0,0 +1,36 @@
+# IT4Innovations 2019
+
+name = 'imkl'
+version = '2019.3.199'
+#versionsuffix = '-GCC-9.1.0-2.32'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'iimpi', 'version': '2019.03-GCC-9.1.0-2.32'}
+
+sources = ['l_mkl_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+modluafooter = 'add_property("state","experimental")'
+
+moduleclass = 'numlib'
diff --git a/i/intel/intel-2019.03-GCC-9.1.0-2.32.eb b/i/intel/intel-2019.03-GCC-9.1.0-2.32.eb
index 39485680..ab5db602 100644
--- a/i/intel/intel-2019.03-GCC-9.1.0-2.32.eb
+++ b/i/intel/intel-2019.03-GCC-9.1.0-2.32.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('icc', compver, gccsuff),
     ('ifort', compver, gccsuff),
     ('impi', '2019.3.199', '', ('iccifort', '%s%s' % (compver, gccsuff))),
-    ('imkl', '2019.3.199', '', ('iimpi', version)),
+    ('imkl', '2019.3.199', '', ('iimpi', '%s%s' % (version, gccsuff))),
 ]
 
 modluafooter = 'add_property("state","experimental")'