diff --git a/i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb b/i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb
new file mode 100644
index 00000000..0ed7f742
--- /dev/null
+++ b/i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb
@@ -0,0 +1,31 @@
+name = 'icc'
+version = '2018.0.128'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Intel C and C++ compilers"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
+
+checksums = ['5bd22f0b1d2f01dfdee755aeae4c89fa']
+
+gccver = '6.4.0'
+binutilsver = '2.28'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', 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/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb
new file mode 100644
index 00000000..1576a4a3
--- /dev/null
+++ b/i/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb
@@ -0,0 +1,17 @@
+easyblock = 'Toolchain'
+
+name = 'iccifort'
+version = '2018.0.128'
+versionsuffix = '-GCC-6.4.0-2.28'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = "Intel C, C++ & Fortran compilers"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb
new file mode 100644
index 00000000..aafe6ebf
--- /dev/null
+++ b/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb
@@ -0,0 +1,37 @@
+name = 'ifort'
+version = '2018.0.128'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Intel Fortran compiler"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
+
+checksums = [
+    '05d04873d47043ef6fd55a85ce501e6d',  # parallel_studio_xe_2018_composer_edition_for_fortran.tgz
+    '7241e492a5f7ba4e62e8106c97f585c2fd931e32886d886f7bf0a9020e421325',  # ifort_2017_no_mpi_mic_dependency.patch
+]
+
+# remove dependency on intel-mpi-rt-mic
+patches = ['ifort_2017_no_mpi_mic_dependency.patch']
+
+gccver = '6.4.0'
+binutilsver = '2.28'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', 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/ifort/ifort_2017_no_mpi_mic_dependency.patch b/i/ifort/ifort_2017_no_mpi_mic_dependency.patch
new file mode 100644
index 00000000..8d3929a0
--- /dev/null
+++ b/i/ifort/ifort_2017_no_mpi_mic_dependency.patch
@@ -0,0 +1,13 @@
+Eliminate dependency on intel-mpi-rt-mic which in turn brings in intel-mpi-rt.
+author: Bart Oldeman (McGill HPC) 
+--- pset/mediaconfig.xml.orig      2016-10-20 09:02:57.000000000 +0000
++++ pset/mediaconfig.xml   2016-11-11 20:09:08.084892189 +0000
+@@ -1551,7 +1551,7 @@
+       <MapFileDir>${BUNDLE_MAPFILE_DIR}</MapFileDir>
+       <ChklicIA32>${BUNDLE_CHKLIC_IA32}</ChklicIA32>
+     </Component>
+-    <Component depend="1.3;33.111;33.112;1.432;118.3" id="114" invisible="0" mandatory="0" platform="INTEL64">
++    <Component depend="1.3;33.111;33.112;1.432" id="114" invisible="0" mandatory="0" platform="INTEL64">
+       <Name>Intel Fortran Compiler for Intel(R) 64</Name>
+       <Description>Intel(R) Fortran Compiler 17.0 Update 1</Description>
+       <Name locale="ja_JP.UTF-8">インテル(R) Fortran コンパイラー (インテル(R) 64)</Name>
diff --git a/i/iimpi/iimpi-2018.00.eb b/i/iimpi/iimpi-2018.00.eb
new file mode 100644
index 00000000..3ed4dd62
--- /dev/null
+++ b/i/iimpi/iimpi-2018.00.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2018.00'
+
+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': 'dummy'}
+
+compver = '2018.0.128'
+suff = '-GCC-6.4.0-2.28'
+dependencies = [
+    ('icc', compver, suff),
+    ('ifort', compver, suff),
+    ('impi', compver, '', ('iccifort', '%s%s' % (compver, suff))),
+]
+
+moduleclass = 'toolchain'
diff --git a/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb b/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
new file mode 100644
index 00000000..648037d2
--- /dev/null
+++ b/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
@@ -0,0 +1,36 @@
+name = 'imkl'
+version = '2018.0.128'
+
+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': '2018.00'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['0fa23779816a0f2ee23a396fc1af9978']
+
+dontcreateinstalldir = 'True'
+
+license_file = '/apps/licenses/intel/license.lic'
+
+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/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic_f.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/i/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb
new file mode 100644
index 00000000..30a99a55
--- /dev/null
+++ b/i/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb
@@ -0,0 +1,31 @@
+# This is an easyconfig file for EasyBuild, see http://easybuilders.github.io/easybuild
+
+name = 'impi'
+version = '2018.0.128'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = "Intel MPI Library, compatible with MPICH ABI"
+
+toolchain = {'name': 'iccifort', 'version': '2018.0.128-GCC-6.4.0-2.28'}
+
+sources = ['l_mpi_%(version)s.tgz']
+
+checksums = ['15b46fc6a3014595de897aa48d3a658b']
+
+dontcreateinstalldir = 'True'
+
+components = ['intel-mpi', 'intel-psxe', 'intel-imb']
+
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
+postinstallcmds = [
+    'ln -s %(installdir)s/lib64/libmpi.so  %(installdir)s/lib64/libmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigc4.so  %(installdir)s/lib64/libmpichcxx.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libfmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libmpichf90.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libmpl.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
+]
+
+moduleclass = 'mpi'
diff --git a/i/intel/intel-2018.00.eb b/i/intel/intel-2018.00.eb
new file mode 100644
index 00000000..4b987aaf
--- /dev/null
+++ b/i/intel/intel-2018.00.eb
@@ -0,0 +1,24 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2018.00'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = "Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL)."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+compver = '2018.0.128'
+gccver = '6.4.0'
+binutilsver = '2.28'
+gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '-GCCcore-%s' % gccver),
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', compver, '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', compver, '', ('iimpi', version)),
+]
+
+moduleclass = 'toolchain'