diff --git a/i/icc/icc-2019.1.144-GCC-8.2.0-2.31.1.eb b/i/icc/icc-2019.1.144-GCC-8.2.0-2.31.1.eb
new file mode 100644
index 00000000..f4436899
--- /dev/null
+++ b/i/icc/icc-2019.1.144-GCC-8.2.0-2.31.1.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://easybuilders.github.io/easybuild
+
+name = 'icc'
+version = '2019.1.144'
+
+homepage = 'https://software.intel.com/en-us/intel-compilers/'
+description = "Intel C and C++ compilers"
+
+toolchain = SYSTEM
+
+source_urls = ['https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14865/']
+sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
+checksums = ['4a156bbeac9bd8d67e74b33ad6f3ae02d4c24c8444365465db6dc50d3e891946']
+
+local_gccver = '8.2.0'
+local_binutilsver = '2.31.1'
+versionsuffix = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
+
+dependencies = [
+    ('GCCcore', local_gccver),
+    ('binutils', local_binutilsver, '', ('GCCcore', local_gccver)),
+]
+
+# list of regex for components to install
+# full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
+# cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
+components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb(?!.*mic)']
+
+dontcreateinstalldir = True
+
+license_file = '/apps/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2019.1.144-GCC-8.2.0-2.31.1.eb b/i/ifort/ifort-2019.1.144-GCC-8.2.0-2.31.1.eb
new file mode 100644
index 00000000..f409203a
--- /dev/null
+++ b/i/ifort/ifort-2019.1.144-GCC-8.2.0-2.31.1.eb
@@ -0,0 +1,38 @@
+# This is an easyconfig file for EasyBuild, see http://easybuilders.github.io/easybuild
+
+name = 'ifort'
+version = '2019.1.144'
+
+homepage = 'https://software.intel.com/en-us/intel-compilers/'
+description = "Intel Fortran compiler"
+
+toolchain = SYSTEM
+
+source_urls = ['https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14866/']
+sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
+patches = ['ifort-%(version)s_no_mpi_mic_dependency.patch']
+checksums = [
+    # parallel_studio_xe_2019_update1_composer_edition_for_fortran.tgz
+    '55a5a3d1edb92faff76d7af5522803590247afef9dec6cc9b9f211ba385b0c23',
+    '12910d18c9f0560aeed80e6425903039d4b3198134155b47e99ff0c03a693ecd',  # ifort-2019.1.144_no_mpi_mic_dependency.patch
+]
+
+local_gccver = '8.2.0'
+local_binutilsver = '2.31.1'
+versionsuffix = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
+
+dependencies = [
+    ('GCCcore', local_gccver),
+    ('binutils', local_binutilsver, '', ('GCCcore', local_gccver)),
+]
+
+# list of regex for components to install
+# full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
+# cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
+components = ['intel-comp', 'intel-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_', 'intel-gdb(?!.*mic)']
+
+dontcreateinstalldir = True
+
+license_file = '/apps/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/i/iimpi/iimpi-2019a.eb b/i/iimpi/iimpi-2019a.eb
deleted file mode 100644
index 4df9e1aa..00000000
--- a/i/iimpi/iimpi-2019a.eb
+++ /dev/null
@@ -1,21 +0,0 @@
-# IT4Innovations 2019
-
-easyblock = "Toolchain"
-
-name = 'iimpi'
-version = '2019a'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-local_compiler/'
-description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
-
-toolchain = SYSTEM
-
-local_compver = '2019.5.281'
-local_suff = '-GCC-8.3.0-2.32'
-dependencies = [
-    ('icc', local_compver, local_suff),
-    ('ifort', local_compver, local_suff),
-    ('impi', '2018.5.288', '', ('iccifort', '%s%s' % (local_compver, local_suff))),
-]
-
-moduleclass = 'toolchain'
diff --git a/i/intel/intel-2019a.eb b/i/intel/intel-2019a.eb
deleted file mode 100644
index c812b75d..00000000
--- a/i/intel/intel-2019a.eb
+++ /dev/null
@@ -1,26 +0,0 @@
-# IT4Innovations 2019
-
-easyblock = 'Toolchain'
-
-name = 'intel'
-version = '2019a'
-
-homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-local_compiler/'
-description = "Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL)."
-
-toolchain = SYSTEM
-
-local_compver = '2019.5.281'
-local_gccver = '8.3.0'
-local_binutilsver = '2.32'
-local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
-dependencies = [
-    ('GCCcore', local_gccver),
-    ('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
-    ('icc', local_compver, local_gccsuff),
-    ('ifort', local_compver, local_gccsuff),
-    ('impi', '2018.5.288', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
-    ('imkl', local_compver, '', ('iimpi', version)),
-]
-
-moduleclass = 'toolchain'