diff --git a/i/imkl/imkl-2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27.eb b/i/imkl/imkl-2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..1ffa6292
--- /dev/null
+++ b/i/imkl/imkl-2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27.eb
@@ -0,0 +1,38 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '2017.1.132'
+
+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': 'iccifort', 'version': '2017.1.132-GCC-6.3.0-2.27'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['7911c0f777c4cb04225bf4518088939e']
+
+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/imkl/imkl-2017.3.196-iimpi-2017.05-GCC-7.1.0-2.28.eb b/i/imkl/imkl-2017.1.132-iompi-2017a-2.0.1.eb
similarity index 88%
rename from i/imkl/imkl-2017.3.196-iimpi-2017.05-GCC-7.1.0-2.28.eb
rename to i/imkl/imkl-2017.1.132-iompi-2017a-2.0.1.eb
index 30cdd90b..7c9a27fb 100644
--- a/i/imkl/imkl-2017.3.196-iimpi-2017.05-GCC-7.1.0-2.28.eb
+++ b/i/imkl/imkl-2017.1.132-iompi-2017a-2.0.1.eb
@@ -1,7 +1,7 @@
 # This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
 
 name = 'imkl'
-version = '2017.3.196'
+version = '2017.1.132'
 
 homepage = 'http://software.intel.com/en-us/intel-mkl/'
 description = """Intel Math Kernel Library is a library of highly optimized,
@@ -9,13 +9,15 @@ description = """Intel Math Kernel Library is a library of highly optimized,
  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': '2017.05-GCC-7.1.0-2.28'}
+toolchain = {'name': 'iompi', 'version': '2017a-2.0.1'}
 
 sources = ['l_mkl_%(version)s.tgz']
-checksums = ['4a2eb4bee789391d9c07d7c348a80702']
+checksums = ['7911c0f777c4cb04225bf4518088939e']
 
 dontcreateinstalldir = 'True'
 
+license_file = '/apps/licenses/intel/license.lic'
+
 interfaces = True
 
 postinstallcmds = [
@@ -25,8 +27,8 @@ postinstallcmds = [
     '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_f.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 = {
diff --git a/i/iompi/iompi-2017-2.0.1.eb b/i/iompi/iompi-2017-2.0.1.eb
new file mode 100644
index 00000000..ac547e02
--- /dev/null
+++ b/i/iompi/iompi-2017-2.0.1.eb
@@ -0,0 +1,21 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iompi'
+version = '2017a-2.0.1'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Open MPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2017.1.132'
+compversuff = '-GCC-6.3.0-2.27'
+
+dependencies = [
+    ('icc', compver, compversuff),
+    ('ifort', compver, compversuff),
+    ('OpenMPI', '2.0.1', '', ('iccifort', '2017.1.132-GCC-6.3.0-2.27')),
+]
+
+moduleclass = 'toolchain'
diff --git a/o/OpenMPI/OpenMPI-2.0.1-iccifort-2017.1.132-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-2.0.1-iccifort-2017.1.132-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..621eb75f
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-2.0.1-iccifort-2017.1.132-GCC-6.3.0-2.27.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.0.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'iccifort', 'version': '2017.1.132-GCC-6.3.0-2.27'}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads',]
+
+dependencies = [
+   ('hwloc', '1.11.7', '', ('GCC', '6.3.0-2.27')),
+   ('Java', '1.8.0_112', '', True),
+]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+configopts += '--enable-mpi-java ' # Java support RT#4090
+
+# for PBS Pro 13
+preconfigopts = 'export LIBS="-ldl" && '
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel'),]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+
+moduleclass = 'mpi'