diff --git a/a/APR-util/APR-util-1.5.4.eb b/a/APR-util/APR-util-1.5.4.eb
new file mode 100644
index 00000000..38b3c328
--- /dev/null
+++ b/a/APR-util/APR-util-1.5.4.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'APR-util'
+version = '1.5.4'
+
+homepage = 'http://apr.apache.org/'
+description = "Apache Portable Runtime (APR) util libraries."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://archive.apache.org/dist/apr/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('APR', '1.5.2'),
+    ('SQLite', '3.17.0'),
+    ('expat', '2.2.0'),
+]
+
+configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-sqlite3=$EBROOTSQLITE --with-expat=$EBROOTEXPAT "
+
+sanity_check_paths = {
+    'files': ["bin/apu-1-config", "lib/libaprutil-1.%s" % SHLIB_EXT, "lib/libaprutil-1.a"],
+    'dirs': ["include/apr-1"],
+}
+
+parallel = 1
+
+moduleclass = 'tools'
diff --git a/a/APR/APR-1.5.2.eb b/a/APR/APR-1.5.2.eb
new file mode 100644
index 00000000..c88998bf
--- /dev/null
+++ b/a/APR/APR-1.5.2.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'APR'
+version = '1.5.2'
+
+homepage = 'http://apr.apache.org/'
+description = "Apache Portable Runtime (APR) libraries."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://archive.apache.org/dist/apr/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["bin/apr-1-config", "lib/libapr-1.%s" % SHLIB_EXT, "lib/libapr-1.a"],
+    'dirs': ["include/apr-1"],
+}
+
+moduleclass = 'tools'
diff --git a/a/attrs/attrs-14.4.0-Py-2.7.eb b/a/attrs/attrs-14.4.0-Py-2.7.eb
new file mode 100644
index 00000000..23d3377c
--- /dev/null
+++ b/a/attrs/attrs-14.4.0-Py-2.7.eb
@@ -0,0 +1,23 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'attrs'
+version = '17.4.0'
+
+homepage = 'http://www.attrs.org/'
+description = 'Classes Without Boilerplate'
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+options = {'modulename': 'attr'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7.egg'],
+}
+
+moduleclass = 'python'
diff --git a/c/cereal/cereal-1.2.1.eb b/c/cereal/cereal-1.2.1.eb
new file mode 100644
index 00000000..8b38f335
--- /dev/null
+++ b/c/cereal/cereal-1.2.1.eb
@@ -0,0 +1,23 @@
+# IT4Innovations 2018
+
+easyblock = 'Tarball'
+
+name = 'cereal'
+version = '1.2.1'
+
+homepage = 'http://uscilab.github.io/cereal/'
+description = 'cereal is a header-only C++11 serialization library.'
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/USCiLab/cereal/archive/']
+sources = ['v%(version)s.tar.gz']
+
+skipsteps = ['configure', 'build']
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['include/cereal'],
+}
+
+moduleclass = 'lib'
diff --git a/f/fontconfig/fontconfig-2.11.1.eb b/f/fontconfig/fontconfig-2.11.1.eb
index 28ee73d5..908eccbe 100644
--- a/f/fontconfig/fontconfig-2.11.1.eb
+++ b/f/fontconfig/fontconfig-2.11.1.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = "fontconfig"
 version = '2.11.1'
-versionsuffix = '-upgrade'
+#versionsuffix = '-upgrade'
 
 homepage = 'http://www.freedesktop.org/software/fontconfig'
 description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
diff --git a/h/HDF5/HDF5-1.10.1-serial.eb b/h/HDF5/HDF5-1.10.1-serial.eb
new file mode 100644
index 00000000..67f67bc1
--- /dev/null
+++ b/h/HDF5/HDF5-1.10.1-serial.eb
@@ -0,0 +1,22 @@
+# IT4Innovations 2017
+
+name = 'HDF5'
+version = '1.10.1'
+versionsuffix= '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version_major_minor)s/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.11', '', True),
+    ('Szip', '2.1', '', True),
+]
+
+moduleclass = 'data'
diff --git a/h/h5py/h5py-2.7.1-Py-2.7.eb b/h/h5py/h5py-2.7.1-Py-2.7.eb
new file mode 100644
index 00000000..31d064a8
--- /dev/null
+++ b/h/h5py/h5py-2.7.1-Py-2.7.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'h5py'
+version = '2.7.1'
+
+homepage = 'https://github.com/jupyter/testpath'
+description = """Test utilities for code working with files and commands"""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('HDF5', '1.10.1', '-serial', ('GCC', '6.3.0-2.27')),
+    ('numpy', '1.13.3'),
+    ('mpi4py', '3.0.0'),  # required for MPI support
+    ('six', '1.11.0'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/h5py-2.7.1-py2.7-linux-x86_64.egg'],
+}
+moduleclass = 'python'
diff --git a/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..e59c407a
--- /dev/null
+++ b/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
@@ -0,0 +1,31 @@
+name = 'icc'
+version = '2017.5.239'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Intel C and C++ compilers"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
+
+checksums = ['b31c6a83653cbc94123f75ce1781e01f']
+
+gccver = '6.3.0'
+binutilsver = '2.27'
+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', 'intel-gdb(?!.*mic)']
+
+dontcreateinstalldir = 'True'
+
+license_file = '/apps/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb b/i/icc/icc-2018.1.163-GCC-6.4.0-2.28.eb
similarity index 78%
rename from i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb
rename to i/icc/icc-2018.1.163-GCC-6.4.0-2.28.eb
index 5a34758e..5fff12d3 100644
--- a/i/icc/icc-2018.0.128-GCC-6.4.0-2.28.eb
+++ b/i/icc/icc-2018.1.163-GCC-6.4.0-2.28.eb
@@ -1,14 +1,14 @@
 name = 'icc'
-version = '2018.0.128'
+version = '2018.1.163'
 
 homepage = 'http://software.intel.com/en-us/intel-compilers/'
 description = "Intel C and C++ compilers"
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
+sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
 
-checksums = ['5bd22f0b1d2f01dfdee755aeae4c89fa']
+checksums = ['ddbfdf88eed095817650ec0a226ef3b9c07c41c855d258e80eaade5173fedb6e']
 
 gccver = '6.4.0'
 binutilsver = '2.28'
@@ -28,8 +28,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-postinstallcmds = [
-    'rm /tmp/easybuild/easybuild_intel/* -rf',
-]
-
 moduleclass = 'compiler'
diff --git a/i/iccifort/iccifort-2017.5.239-GCC-6.3.0-2.27.eb b/i/iccifort/iccifort-2017.5.239-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..1254f4fb
--- /dev/null
+++ b/i/iccifort/iccifort-2017.5.239-GCC-6.3.0-2.27.eb
@@ -0,0 +1,17 @@
+easyblock = 'Toolchain'
+
+name = 'iccifort'
+version = '2017.5.239'
+versionsuffix = '-GCC-6.3.0-2.27'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = "Intel C, C++ & Fortran compilers"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/i/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/iccifort/iccifort-2018.1.163-GCC-6.4.0-2.28.eb
similarity index 81%
rename from i/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb
rename to i/iccifort/iccifort-2018.1.163-GCC-6.4.0-2.28.eb
index 1576a4a3..c5f93491 100644
--- a/i/iccifort/iccifort-2018.0.128-GCC-6.4.0-2.28.eb
+++ b/i/iccifort/iccifort-2018.1.163-GCC-6.4.0-2.28.eb
@@ -1,13 +1,13 @@
 easyblock = 'Toolchain'
 
 name = 'iccifort'
-version = '2018.0.128'
+version = '2018.1.163'
 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'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 dependencies = [
     ('icc', version, versionsuffix),
diff --git a/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..12b550f8
--- /dev/null
+++ b/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
@@ -0,0 +1,34 @@
+name = 'ifort'
+version = '2017.5.239'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "Intel Fortran compiler"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
+
+checksums = ['66968fb808eee91b6ee7dbd1c76d337f']
+
+# remove dependency on intel-mpi-rt-mic
+patches = ['ifort_2017_no_mpi_mic_dependency.patch']
+
+gccver = '6.3.0'
+binutilsver = '2.27'
+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']
+
+dontcreateinstalldir = 'True'
+
+license_file = '/apps/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/ifort/ifort-2018.1.163-GCC-6.4.0-2.28.eb
similarity index 62%
rename from i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb
rename to i/ifort/ifort-2018.1.163-GCC-6.4.0-2.28.eb
index fa97f26b..41828935 100644
--- a/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb
+++ b/i/ifort/ifort-2018.1.163-GCC-6.4.0-2.28.eb
@@ -1,21 +1,19 @@
 name = 'ifort'
-version = '2018.0.128'
+version = '2018.1.163'
 
 homepage = 'http://software.intel.com/en-us/intel-compilers/'
 description = "Intel Fortran compiler"
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
-
+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 = [
-    '05d04873d47043ef6fd55a85ce501e6d',  # parallel_studio_xe_2018_composer_edition_for_fortran.tgz
-    '7241e492a5f7ba4e62e8106c97f585c2fd931e32886d886f7bf0a9020e421325',  # ifort_2017_no_mpi_mic_dependency.patch
+    # parallel_studio_xe_2018_update1_composer_edition_for_fortran.tgz
+    'c9e7a3ecd89632e4a2babf3a483542edcfd7bc8646ee616f035a0caaf936dcd0',
+    'fdc818390643e77b3dc7ae1d9ba4547e1f1792da8674ff47747c56d97be6fb99',   # ifort_2018.1.163_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)
@@ -34,8 +32,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-postinstallcmds = [
-    'rm /tmp/easybuild/easybuild_intel/* -rf',
-]
-
 moduleclass = 'compiler'
diff --git a/i/ifort/ifort_2018.1.163_no_mpi_mic_dependency.patch b/i/ifort/ifort_2018.1.163_no_mpi_mic_dependency.patch
new file mode 100644
index 00000000..8dc2da61
--- /dev/null
+++ b/i/ifort/ifort_2018.1.163_no_mpi_mic_dependency.patch
@@ -0,0 +1,11 @@
+--- parallel_studio_xe_2018_update1_composer_edition_for_fortran/pset/mediaconfig.xml.orig	2017-11-15 14:33:21.020900575 +0100
++++ parallel_studio_xe_2018_update1_composer_edition_for_fortran/pset/mediaconfig.xml	2017-11-15 14:33:25.910946330 +0100
+@@ -962,7 +962,7 @@
+     </Layers>
+     <InstallDir>${COMPLIB_ROOT}</InstallDir>
+     <GUID>1510147141733</GUID>
+-    <Component depend="35.3;1.1;1.3;1.91;1.11;1.12;1.14;1.16;1.7;1.27;1.24;142.2" id="1" invisible="0" mandatory="0" platform="INTEL64">
++    <Component depend="35.3;1.1;1.3;1.91;1.11;1.12;1.14;1.16;1.7;1.27;1.24" id="1" invisible="0" mandatory="0" platform="INTEL64">
+       <Name>Intel Fortran Compiler for Intel(R) 64</Name>
+       <Description>Intel Fortran Compiler 18.0 Update 1</Description>
+       <Name locale="ja_JP.UTF-8">インテル(R) Fortran コンパイラー (インテル(R) 64)</Name>
diff --git a/i/iimpi/iimpi-2017b.eb b/i/iimpi/iimpi-2017b.eb
index fc556c6a..c883c6d8 100644
--- a/i/iimpi/iimpi-2017b.eb
+++ b/i/iimpi/iimpi-2017b.eb
@@ -8,12 +8,12 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-compver = '2017.4.196'
+compver = '2017.5.239'
 suff = '-GCC-6.3.0-2.27'
 dependencies = [
     ('icc', compver, suff),
     ('ifort', compver, suff),
-    ('impi', '2017.3.196', '', ('iccifort', '%s%s' % (compver, suff))),
+    ('impi', '2017.4.239', '', ('iccifort', '%s%s' % (compver, suff))),
 ]
 
 moduleclass = 'toolchain'
diff --git a/i/iimpi/iimpi-2018.00.eb b/i/iimpi/iimpi-2018a.eb
similarity index 75%
rename from i/iimpi/iimpi-2018.00.eb
rename to i/iimpi/iimpi-2018a.eb
index 3ed4dd62..904a6c4b 100644
--- a/i/iimpi/iimpi-2018.00.eb
+++ b/i/iimpi/iimpi-2018a.eb
@@ -1,14 +1,14 @@
-easyblock = "Toolchain"
+easyblock = 'Toolchain'
 
 name = 'iimpi'
-version = '2018.00'
+version = '2018a'
 
 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'}
+toolchain = {'name': 'dummy', 'version': ''}
 
-compver = '2018.0.128'
+compver = '2018.1.163'
 suff = '-GCC-6.4.0-2.28'
 dependencies = [
     ('icc', compver, suff),
diff --git a/i/imkl/imkl-2017.4.239-iimpi-2017b.eb b/i/imkl/imkl-2017.4.239-iimpi-2017b.eb
new file mode 100644
index 00000000..7afc03d1
--- /dev/null
+++ b/i/imkl/imkl-2017.4.239-iimpi-2017b.eb
@@ -0,0 +1,34 @@
+name = 'imkl'
+version = '2017.4.239'
+
+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': '2017b'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['3066272dd0ad3da7961b3d782e1fab3b']
+
+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/',
+    '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/',
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb b/i/imkl/imkl-2018.1.163-iimpi-2018a.eb
similarity index 88%
rename from i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
rename to i/imkl/imkl-2018.1.163-iimpi-2018a.eb
index 1313f305..4f8ff639 100644
--- a/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
+++ b/i/imkl/imkl-2018.1.163-iimpi-2018a.eb
@@ -1,5 +1,5 @@
 name = 'imkl'
-version = '2018.0.128'
+version = '2018.1.163'
 
 homepage = 'http://software.intel.com/en-us/intel-mkl/'
 description = """Intel Math Kernel Library is a library of highly optimized,
@@ -7,10 +7,10 @@ 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': '2018.00'}
+toolchain = {'name': 'iimpi', 'version': '2018a'}
 
 sources = ['l_mkl_%(version)s.tgz']
-checksums = ['0fa23779816a0f2ee23a396fc1af9978']
+checksums = ['f6dc263fc6f3c350979740a13de1b1e8745d9ba0d0f067ece503483b9189c2ca']
 
 dontcreateinstalldir = 'True'
 
diff --git a/i/impi/impi-2017.4.239-iccifort-2017.5.239-GCC-6.3.0-2.27.eb b/i/impi/impi-2017.4.239-iccifort-2017.5.239-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..4208e8bc
--- /dev/null
+++ b/i/impi/impi-2017.4.239-iccifort-2017.5.239-GCC-6.3.0-2.27.eb
@@ -0,0 +1,29 @@
+name = 'impi'
+version = '2017.4.239'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = "Intel MPI Library, compatible with MPICH ABI"
+
+toolchain = {'name': 'iccifort', 'version': '2017.5.239-GCC-6.3.0-2.27'}
+
+sources = ['l_mpi_%(version)s.tgz']
+
+checksums = ['460a9ef1b3599d60b4d696e3f0f2a14d']
+
+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/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb b/i/impi/impi-2018.1.163-iccifort-2018.1.163-GCC-6.4.0-2.28.eb
similarity index 81%
rename from i/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb
rename to i/impi/impi-2018.1.163-iccifort-2018.1.163-GCC-6.4.0-2.28.eb
index eb8ae248..8a5d98c3 100644
--- a/i/impi/impi-2018.0.128-iccifort-2018.0.128-GCC-6.4.0-2.28.eb
+++ b/i/impi/impi-2018.1.163-iccifort-2018.1.163-GCC-6.4.0-2.28.eb
@@ -1,14 +1,14 @@
 name = 'impi'
-version = '2018.0.128'
+version = '2018.1.163'
 
 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'}
+toolchain = {'name': 'iccifort', 'version': '2018.1.163-GCC-6.4.0-2.28'}
 
 sources = ['l_mpi_%(version)s.tgz']
 
-checksums = ['15b46fc6a3014595de897aa48d3a658b']
+checksums = ['130b11571c3f71af00a722fa8641db5a1552ac343d770a8304216d8f5d00e75c']
 
 dontcreateinstalldir = 'True'
 
@@ -26,8 +26,4 @@ postinstallcmds = [
     'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
 ]
 
-postinstallcmds = [
-    'rm /tmp/easybuild/easybuild_intel/* -rf',
-]
-
 moduleclass = 'mpi'
diff --git a/i/intel/intel-2017b.eb b/i/intel/intel-2017b.eb
index 7f854202..c4e39069 100644
--- a/i/intel/intel-2017b.eb
+++ b/i/intel/intel-2017b.eb
@@ -8,7 +8,7 @@ description = "Compiler toolchain including Intel compilers, Intel MPI and Intel
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-compver = '2017.4.196'
+compver = '2017.5.239'
 gccver = '6.3.0'
 binutilsver = '2.27'
 gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
@@ -17,8 +17,8 @@ dependencies = [
     ('binutils', binutilsver, '-GCCcore-%s' % gccver),
     ('icc', compver, gccsuff),
     ('ifort', compver, gccsuff),
-    ('impi', '2017.3.196', '', ('iccifort', '%s%s' % (compver, gccsuff))),
-    ('imkl', '2017.3.196', '', ('iimpi', version)),
+    ('impi', '2017.4.239', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '2017.4.239', '', ('iimpi', version)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/i/intel/intel-2018.00.eb b/i/intel/intel-2018a.eb
similarity index 93%
rename from i/intel/intel-2018.00.eb
rename to i/intel/intel-2018a.eb
index 4b987aaf..b5e99e97 100644
--- a/i/intel/intel-2018.00.eb
+++ b/i/intel/intel-2018a.eb
@@ -1,14 +1,14 @@
 easyblock = 'Toolchain'
 
 name = 'intel'
-version = '2018.00'
+version = '2018a'
 
 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'
+compver = '2018.1.163'
 gccver = '6.4.0'
 binutilsver = '2.28'
 gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
diff --git a/l/lxml/lxml-4.1.1-Py-2.7.eb b/l/lxml/lxml-4.1.1-Py-2.7.eb
new file mode 100644
index 00000000..eae0df0d
--- /dev/null
+++ b/l/lxml/lxml-4.1.1-Py-2.7.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+
+name = 'lxml'
+version = '4.1.1'
+
+homepage = 'http://lxml.de/'
+description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libxml2', '2.9.4', '', True),
+    ('libxslt', '1.1.29', '', True),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': [('lib/python2.7/site-packages/%(name)s-%(version)s-py2.7-linux-x86_64.egg')]
+}
+
+moduleclass = 'python'
diff --git a/m/matplotlib/matplotlib-2.1.1-Py-2.7.eb b/m/matplotlib/matplotlib-2.1.1-Py-2.7.eb
new file mode 100644
index 00000000..5ea034a6
--- /dev/null
+++ b/m/matplotlib/matplotlib-2.1.1-Py-2.7.eb
@@ -0,0 +1,31 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'matplotlib'
+version = '2.1.1'
+
+homepage = 'http://matplotlib.org'
+description = """Matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = ['https://github.com/matplotlib/matplotlib/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('freetype', '2.8', '', True),
+    ('libpng', '1.6.29', '', True),
+    ('python-dateutil', '2.6.1'),
+    ('numpy', '1.13.3'),
+    ('pyparsing', '2.2.0'),
+    ('six', '1.11.0'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7-linux-x86_64.egg/%(name)s'],
+}
+
+moduleclass = 'python'
diff --git a/m/mpi4py/mpi4py-3.0.0-Py-2.7.eb b/m/mpi4py/mpi4py-3.0.0-Py-2.7.eb
new file mode 100644
index 00000000..9e101beb
--- /dev/null
+++ b/m/mpi4py/mpi4py-3.0.0-Py-2.7.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '3.0.0'
+
+homepage = 'http://mpi4py.scipy.org/docs'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('OpenMPI', '1.10.7', '', ('GCC', '6.3.0-2.27')),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/mpi4py'],
+}
+
+moduleclass = 'python'
diff --git a/n/nettle/nettle-3.2-intel-2017a.eb b/n/nettle/nettle-3.2-intel-2017a.eb
index a2fe54f5..6bb7c90d 100644
--- a/n/nettle/nettle-3.2-intel-2017a.eb
+++ b/n/nettle/nettle-3.2-intel-2017a.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'nettle'
 version = '3.2'
-versionsuffix = "-fix_bug"
+#versionsuffix = "-fix_bug"
 
 homepage = 'http://www.lysator.liu.se/~nisse/nettle/'
 description = """Nettle is a cryptographic library that is designed to fit easily
diff --git a/n/numpy/.cache/v/cache/lastfailed b/n/numpy/.cache/v/cache/lastfailed
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/n/numpy/.cache/v/cache/lastfailed
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/n/numpy/numpy-1.13.3-Py-2.7.eb b/n/numpy/numpy-1.13.3-Py-2.7.eb
new file mode 100644
index 00000000..ba0eb50c
--- /dev/null
+++ b/n/numpy/numpy-1.13.3-Py-2.7.eb
@@ -0,0 +1,32 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'numpy'
+version = '1.13.3'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package needed for scientific computing with Python."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = ['https://github.com/numpy/numpy/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+patch = [
+    'numpy-1.8.1-mkl.patch',
+    'numpy-1.11.0-sse42.patch'
+]
+
+dependencies = [
+    ('mkl', '2017.4.239', '', True),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7-linux-x86_64.egg/numpy'],
+}
+
+sanity_check_commands = [('python', '-c "import numpy; assert(numpy.__version__ == \'%(version)s\')"')]
+
+moduleclass = 'python'
diff --git a/n/numpy/numpy-1.13.3-Py-3.6.eb b/n/numpy/numpy-1.13.3-Py-3.6.eb
index b57fa117..eb3abcb2 100644
--- a/n/numpy/numpy-1.13.3-Py-3.6.eb
+++ b/n/numpy/numpy-1.13.3-Py-3.6.eb
@@ -13,6 +13,11 @@ toolchain = {'name': 'Py', 'version': '3.6'}
 source_urls = ['https://github.com/numpy/numpy/releases/download/v%(version)s']
 sources = ['%(name)s-%(version)s.tar.gz']
 
+patch = [
+    'numpy-1.8.1-mkl.patch',
+    'numpy-1.11.0-sse42.patch'
+]
+
 dependencies = [
     ('mkl', '2017.4.239', '', True),
 ]
diff --git a/o/OpenSSL/OpenSSL-1.0.2n-intel-2017b.eb b/o/OpenSSL/OpenSSL-1.0.2n-intel-2017b.eb
new file mode 100644
index 00000000..e5a69705
--- /dev/null
+++ b/o/OpenSSL/OpenSSL-1.0.2n-intel-2017b.eb
@@ -0,0 +1,19 @@
+name = 'OpenSSL'
+version = '1.0.2n'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'intel', 'version': '2017b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.11', '', True)]
+
+#runtest = 'test'
+
+moduleclass = 'system'
diff --git a/o/OpenSSL/OpenSSL-1.1.0e-intel-2017b.eb b/o/OpenSSL/OpenSSL-1.1.0e-intel-2017b.eb
new file mode 100644
index 00000000..47b76000
--- /dev/null
+++ b/o/OpenSSL/OpenSSL-1.1.0e-intel-2017b.eb
@@ -0,0 +1,19 @@
+name = 'OpenSSL'
+version = '1.1.0e'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'intel', 'version': '2017b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.11', '', True)]
+
+#runtest = 'test'
+
+moduleclass = 'system'
diff --git a/p/PDT/PDT-3.18.1.eb b/p/PDT/PDT-3.18.1.eb
new file mode 100644
index 00000000..912d15e2
--- /dev/null
+++ b/p/PDT/PDT-3.18.1.eb
@@ -0,0 +1,16 @@
+name = 'PDT'
+version = '3.18.1'
+
+homepage = 'http://www.cs.uoregon.edu/research/pdt/'
+description = """Program Database Toolkit (PDT) is a framework for analyzing source
+ code written in several programming languages and for making rich program knowledge
+ accessible to developers of static and dynamic analysis tools. PDT implements a standard
+ program representation, the program database (PDB), that can be accessed in a uniform way
+ through a class library supporting common PDB operations."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['pdtoolkit-%(version)s.tar.gz']
+source_urls = ['http://tau.uoregon.edu/pdt_releases/']
+
+moduleclass = 'perf'
diff --git a/p/Py/Py-2.7.eb b/p/Py/Py-2.7.eb
index 4b51a758..5c0997df 100644
--- a/p/Py/Py-2.7.eb
+++ b/p/Py/Py-2.7.eb
@@ -11,7 +11,8 @@ description = """Python 2.7 toolchain"""
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 dependencies = [ 
-    ('Python', '2.7.14', '-base'),
+    ('Python', '2.7.14', '-base', ('GCC', '6.3.0-2.27')),
+    ('GCC', '6.3.0-2.27'),
 ]
 
 moduleclass = 'toolchain'
diff --git a/p/Py/Py-3.6.eb b/p/Py/Py-3.6.eb
index 0576a0f8..c006cf50 100644
--- a/p/Py/Py-3.6.eb
+++ b/p/Py/Py-3.6.eb
@@ -11,7 +11,8 @@ description = """Python 3.6 toolchain"""
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 dependencies = [
-    ('Python', '3.6.4', '-base'), 
+    ('Python', '3.6.4', '-base', ('GCC', '6.3.0-2.27')),
+    ('GCC', '6.3.0-2.27'),
 ]
 
 moduleclass = 'toolchain'
diff --git a/p/PyYAML/PyYAML-3.12-Py-2.7.eb b/p/PyYAML/PyYAML-3.12-Py-2.7.eb
new file mode 100644
index 00000000..4a351f3d
--- /dev/null
+++ b/p/PyYAML/PyYAML-3.12-Py-2.7.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+
+name = "PyYAML"
+version = "3.12"
+
+homepage = "https://pypi.python.org/pypi/PyYAML/"
+description = """PyYAML is a YAML parser and emitter for the Python programming language."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libyaml', '0.1.7', '', True),
+]
+
+options = {'modulename': 'yaml'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/yaml'],
+}
+
+moduleclass = 'python'
diff --git a/p/Python/.cache/v/cache/lastfailed b/p/Python/.cache/v/cache/lastfailed
new file mode 100644
index 00000000..a5f09be4
--- /dev/null
+++ b/p/Python/.cache/v/cache/lastfailed
@@ -0,0 +1,4 @@
+{
+  "scipy/special/tests/test_data.py::test_boost[<Data for legendre_p_via_assoc_: legendre_p_large_ipp-legendre_p_large>]": true, 
+  "scipy/special/tests/test_data.py::test_boost[<Data for legendre_p_via_lpmn: legendre_p_large_ipp-legendre_p_large>]": true
+}
\ No newline at end of file
diff --git a/p/Python/Python-2.7.14-GCC-6.3.0-2.27-base.eb b/p/Python/Python-2.7.14-GCC-6.3.0-2.27-base.eb
new file mode 100644
index 00000000..b0fa1e91
--- /dev/null
+++ b/p/Python/Python-2.7.14-GCC-6.3.0-2.27-base.eb
@@ -0,0 +1,43 @@
+# IT4Innovations 2018
+
+easyblock = "EB_Python"
+name = 'Python'
+version = '2.7.14'
+versionsuffix = '-base'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('bzip2', '1.0.6', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('libreadline', '7.0', '', True),
+    ('ncurses', '6.0', '', True),
+    ('SQLite', '3.17.0', '', True),
+    ('Tk', '8.6.6', '', True),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+#buildopts = 'CPPFLAGS="-I/apps/all/bzip2/1.0.6/include -I/apps/all/zlib/1.2.8/include -I/apps/all/ncurses/5.9/include -I/apps/all/SQLite/3.8.8.1/include" LDFLAGS="-L/apps/all/bzip2/1.0.6/lib -L/apps/all/zlib/1.2.8/lib -L/apps/all/ncurses/5.9/lib -L/apps/all/SQLite/3.8.8.1/lib:$CPPFLAGS"'
+
+exts_list = [
+    ('setuptools', '38.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+        'source_tmpl': '%(name)s-%(version)s.zip',
+    }),
+    ('pip', '9.0.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/p/Python/Python-3.6.4-GCC-6.3.0-2.27-base.eb b/p/Python/Python-3.6.4-GCC-6.3.0-2.27-base.eb
new file mode 100644
index 00000000..0a47327a
--- /dev/null
+++ b/p/Python/Python-3.6.4-GCC-6.3.0-2.27-base.eb
@@ -0,0 +1,53 @@
+# IT4Innovations 2018
+
+name = 'Python'
+version = '3.6.4'
+versionsuffix = '-base'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+prebuildopts  = 'export CFLAGS="-I${EBROOTXZ}/include" && '
+prebuildopts += 'export LDFLAGS="-L${EBROOTXZ}/lib" && '
+configopts = "--enable-optimizations"
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6', '', True),
+    ('libreadline', '7.0', '', True),
+    ('SQLite', '3.17.0', '', True),
+    ('Tk', '8.6.6', '', True),
+    ('GMP', '6.1.2', '', True),
+    ('XZ', '5.2.3', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('ncurses', '6.0', '', True),
+#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+# order is important!
+# package versions updated Feb 25th 2016
+exts_list = [
+    ('setuptools', '38.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+        'source_tmpl': '%(name)s-%(version)s.zip',
+    }),
+    ('pip', '9.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+]
+
+#modluafooter = 'add_property("state","experimental")'
+
+moduleclass = 'lang'
diff --git a/p/phonopy/phonopy-1.12.4.11-Py-2.7.eb b/p/phonopy/phonopy-1.12.4.11-Py-2.7.eb
new file mode 100644
index 00000000..1f664bcf
--- /dev/null
+++ b/p/phonopy/phonopy-1.12.4.11-Py-2.7.eb
@@ -0,0 +1,25 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'phonopy'
+version = '1.12.4.11'
+
+homepage = 'https://atztogo.github.io/phonopy'
+description = """Phonopy is an open source package of phonon calculations based on the supercell approach."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('matplotlib', '2.1.1'),
+    ('lxml', '4.1.1'),
+    ('PyYAML', '3.12'),
+    ('numpy', '1.13.3'),
+    ('h5py', '2.7.1'),
+    ('scipy', '1.0.0')
+]
+
+moduleclass = 'python'
diff --git a/p/pluggy/pluggy-0.6.0-Py-2.7.eb b/p/pluggy/pluggy-0.6.0-Py-2.7.eb
new file mode 100644
index 00000000..6cc36b11
--- /dev/null
+++ b/p/pluggy/pluggy-0.6.0-Py-2.7.eb
@@ -0,0 +1,21 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'pluggy'
+version = '0.6.0'
+
+homepage = 'https://github.com/pytest-dev/pluggy'
+description = 'Plugin and hook calling mechanisms for python.'
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7.egg'],
+}
+
+moduleclass = 'python'
diff --git a/p/pyparsing/pyparsing-2.2.0-Py-2.7.eb b/p/pyparsing/pyparsing-2.2.0-Py-2.7.eb
new file mode 100644
index 00000000..8b40dd70
--- /dev/null
+++ b/p/pyparsing/pyparsing-2.2.0-Py-2.7.eb
@@ -0,0 +1,21 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'pyparsing'
+version = '2.2.0'
+
+homepage = 'http://pyparsing.wikispaces.com'
+description = """The pyparsing module provides a library of classes 
+  that client code uses to construct the grammar directly in Python code."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'python'
diff --git a/p/pytest/pytest-3.3.2-Py-2.7.eb b/p/pytest/pytest-3.3.2-Py-2.7.eb
new file mode 100644
index 00000000..756c44ac
--- /dev/null
+++ b/p/pytest/pytest-3.3.2-Py-2.7.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'pytest'
+version = '3.3.2'
+
+homepage = 'http://pytest.org'
+description = 'Simple powerful testing with Python'
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('six', '1.11.0'),
+    ('pluggy', '0.6.0'),
+    ('attrs', '17.4.0'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7.egg'],
+}
+
+moduleclass = 'python'
diff --git a/p/python-dateutil/python-dateutil-2.6.1-Py-2.7.eb b/p/python-dateutil/python-dateutil-2.6.1-Py-2.7.eb
new file mode 100644
index 00000000..12e42921
--- /dev/null
+++ b/p/python-dateutil/python-dateutil-2.6.1-Py-2.7.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'python-dateutil'
+version = '2.6.1'
+
+homepage = 'https://github.com/dateutil/dateutil'
+description = 'Useful extensions to the standard Python datetime features.'
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = ['https://github.com/dateutil/dateutil/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('six', '1.11.0'),
+]
+
+options = {'modulename': 'dateutil'}
+
+sanity_check_paths = {
+    'files': ['lib/python2.7/site-packages/python_dateutil-%(version)s-py2.7.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'python'
diff --git a/s/SCons/SCons-2.3.6-Py-2.7.eb b/s/SCons/SCons-2.3.6-Py-2.7.eb
new file mode 100644
index 00000000..b5964c8d
--- /dev/null
+++ b/s/SCons/SCons-2.3.6-Py-2.7.eb
@@ -0,0 +1,22 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'SCons'
+version = '2.3.6'
+
+homepage = 'https://github.com/benjaminp/six'
+description = 'Python 2 and 3 compatibility library.'
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+options = {'modulename': False}
+
+sanity_check_paths = {
+    'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'],
+    'dirs': ['lib/%(namelower)s-%(version)s'],
+}
+
+moduleclass = 'python'
diff --git a/s/SCons/SCons-3.0.0.eb b/s/SCons/SCons-3.0.0.eb
new file mode 100644
index 00000000..c6743a5f
--- /dev/null
+++ b/s/SCons/SCons-3.0.0.eb
@@ -0,0 +1,21 @@
+easyblock = 'PythonPackage'
+
+name = 'SCons'
+version = '3.0.0'
+
+homepage = 'http://www.scons.org/'
+description = "SCons is a software construction tool."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+sanity_check_paths = {
+    'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'],
+    'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'],
+}
+
+options = {'modulename': False}
+
+moduleclass = 'devel'
diff --git a/s/SQLite/SQLite-3.17.0.eb b/s/SQLite/SQLite-3.17.0.eb
index 177cb422..a4cd7128 100644
--- a/s/SQLite/SQLite-3.17.0.eb
+++ b/s/SQLite/SQLite-3.17.0.eb
@@ -24,7 +24,10 @@ source_urls = ['http://www.sqlite.org/2017/']
 version_minor_etc = version.split('.')[1:]
 version_minor_etc += '0' * (3 - len(version_minor_etc))
 version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version_minor_etc)
-sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+sources = [
+    'sqlite-autoconf-%s.tar.gz' % version_str,
+    'sqlite-amalgamation-%s.zip' % version_str,
+]
 
 dependencies = [
     ('libreadline', '7.0'),
diff --git a/s/Serf/Serf-1.3.8.eb b/s/Serf/Serf-1.3.8.eb
new file mode 100644
index 00000000..c19a79ce
--- /dev/null
+++ b/s/Serf/Serf-1.3.8.eb
@@ -0,0 +1,38 @@
+easyblock = 'SCons'
+name = 'Serf'
+version = '1.3.8'
+
+homepage = 'http://serf.apache.org/'
+description = """The serf library is a high performance C-based HTTP client library
+ built upon the Apache Portable Runtime (APR) library"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://archive.apache.org/dist/%(namelower)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = [
+    ('%(name)s-%(version)s_remve_c99_comment.patch'),
+    ('%(name)s-%(version)s_SCons_ld_lib.patch'),
+]
+
+builddependencies = [('SCons', '2.3.6', '-Py-2.7')]
+
+dependencies = [
+    ('APR', '1.5.2'),
+    ('APR-util', '1.5.4'),
+    #   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+buildopts = "APR=$EBROOTAPR/bin/apr-1-config APU=$EBROOTAPRMINUTIL/bin/apu-1-config"
+
+sanity_check_paths = {
+    'files': ['include/serf-1/serf.h'] +
+             ['lib/libserf-1.%s' % x for x in ['a', 'so']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/s/Subversion/Subversion-1.9.3.eb b/s/Subversion/Subversion-1.9.3.eb
new file mode 100644
index 00000000..28cc1603
--- /dev/null
+++ b/s/Subversion/Subversion-1.9.3.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'Subversion'
+version = '1.9.3'
+
+homepage = 'http://subversion.apache.org/'
+description = " Subversion is an open source version control system."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'http://apache.belnet.be/%(namelower)s',
+    'http://www.eu.apache.org/dist/%(namelower)s',
+    'http://www.us.apache.org/dist/%(namelower)s',
+]
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [
+    ('APR', '1.5.2'),
+    ('APR-util', '1.5.4'),
+    ('SQLite', '3.17.0'),
+    ('zlib', '1.2.11'),
+    ('Serf', '1.3.8'),
+]
+
+configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-apr-util=$EBROOTAPRMINUTIL/bin/apu-1-config "
+configopts += "--with-zlib=$EBROOTZLIB --with-sqlite=$EBROOTSQLITE --with-serf=$EBROOTSERF" 
+
+sanity_check_paths = {
+    'files': ["bin/svn", "bin/svnversion"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/s/scipy/scipy-1.0.0-Py-2.7.eb b/s/scipy/scipy-1.0.0-Py-2.7.eb
new file mode 100644
index 00000000..d0933de2
--- /dev/null
+++ b/s/scipy/scipy-1.0.0-Py-2.7.eb
@@ -0,0 +1,33 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'scipy'
+version = '1.0.0'
+
+homepage = 'http://scipy.org'
+description = """SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering.
+  It includes modules for statistics, optimization, integration, linear algebra, Fourier transforms, signal and 
+  image processing, ODE solvers, and more."""
+
+toolchain = {'name': 'Py', 'version': '2.7'}
+toolchainopts = {'pic': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.13.3'),
+    ('mkl', '2017.4.239', '', True),
+]
+
+prebuildopts = 'unset LDFLAGS && '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages/%(name)s-%(version)s-py2.7-linux-x86_64.egg/scipy'],
+}
+
+sanity_check_commands = [('python', '-c "import scipy; assert(scipy.__version__ == \'%(version)s\')"')]
+
+moduleclass = 'python'
diff --git a/s/scipy/scipy-1.0.0-Py-3.6-test.eb b/s/scipy/scipy-1.0.0-Py-3.6-test.eb
deleted file mode 100644
index e1af0b00..00000000
--- a/s/scipy/scipy-1.0.0-Py-3.6-test.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-# IT4Innovations 2018
-
-easyblock = 'PythonPackage'
-
-name = 'scipy'
-version = '1.0.0'
-versionsuffix = '-Py-3.6-test'
-
-homepage = 'http://scipy.org'
-description = """SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering.
-  It includes modules for statistics, optimization, integration, linear algebra, Fourier transforms, signal and 
-  image processing, ODE solvers, and more."""
-
-toolchain = {'name': 'dummy', 'version': ''}
-source_urls = ['https://github.com/scipy/scipy/releases/download/v%(version)s']
-sources = [SOURCELOWER_TAR_GZ]
-
-dependencies = [
-    ('Py', '3.6'),
-    ('numpy', '1.13.3', '-Py-3.6-test'),
-]
-
-builddependencies = [
-    ('imkl', '2017.1.132', '', ('iimpi', '2017a')),
-]
-
-prebuildopts =  'echo "[mkl]" > site.cfg && '
-prebuildopts += 'echo "include_dirs = $EBROOTIMKL/mkl/include" >> site.cfg && '
-prebuildopts += 'echo "library_dirs = $EBROOTIMKL/mkl/lib/intel64" >> site.cfg && '
-prebuildopts += 'echo "mkl_libs = mkl_intel_lp64,mkl_intel_thread,mkl_core" >> site.cfg && '
-prebuildopts += 'echo "lapack_libs = mkl_lapack95_lp64" >> site.cfg && '
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python3.6/site-packages/scipy-1.0.0-py3.6-linux-x86_64.egg/scipy'],
-}
-
-sanity_check_commands = [('python', '-c "import scipy; assert(scipy.__version__ == \'%(version)s\')"')]
-
-moduleclass = 'python'
diff --git a/v/VTune/VTune-2018_update1.eb b/v/VTune/VTune-2018_update1.eb
new file mode 100644
index 00000000..b33309d9
--- /dev/null
+++ b/v/VTune/VTune-2018_update1.eb
@@ -0,0 +1,28 @@
+name = 'VTune'
+version = '2018_update1'
+
+homepage = 'http://software.intel.com/en-us/intel-vtune-amplifier-xe'
+description = "Intel VTune Amplifier XE 2016 is the premier performance profiler for C, C++, C#, Fortran, Assembly and Java."
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['vtune_amplifier_%(version)s.tar.gz']
+
+dontcreateinstalldir = 'True'
+
+# license file
+license_file = '/apps/licenses/intel/license.lic'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['vtune_amplifier_2018.1.0.535340', 'modules'],
+}
+
+# Do necessary post-install steps to build VTune kernel modules
+postinstallcmds = [
+    'mkdir %(installdir)s/modules',
+    'cd %(installdir)s/vtune_amplifier/sepdk/src/ && '
+    './build-driver --install-dir=%(installdir)s/modules --non-interactive',
+]
+
+moduleclass = 'tools'