diff --git a/c/CGAL/CGAL-4.12-intel-2017a.eb b/c/CGAL/CGAL-4.12-intel-2017a.eb
index 8cd39efb..53003769 100644
--- a/c/CGAL/CGAL-4.12-intel-2017a.eb
+++ b/c/CGAL/CGAL-4.12-intel-2017a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('MPFR', '3.1.4'),
     ('GMP', '6.1.2', '', True),
     ('Mesa', '18.1.3', '', ('GCC', '6.3.0-2.27')),
-    ('libGLU', '9.0.0', '', True),
+    ('libGLU', '9.0.0', '', ('GCC', '6.3.0-2.27')),
     ('Qt5', '5.11.1', '', ('GCC', '6.3.0-2.27')),
 ]
 
diff --git a/g/gompi/gompi-2017c.eb b/g/gompi/gompi-2017c.eb
new file mode 100644
index 00000000..d5412c2a
--- /dev/null
+++ b/g/gompi/gompi-2017c.eb
@@ -0,0 +1,22 @@
+# IT4Innovations 2019
+
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '2017c'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+gccver = '6.3.0-2.27'
+
+# compiler toolchain dependencies
+dependencies = [
+    ('GCC', gccver),  # includes both GCC and binutils
+    ('OpenMPI', '2.1.1', '', ('GCC', gccver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/h/HDF5/HDF5-1.10.4-gompi-2017c.eb b/h/HDF5/HDF5-1.10.4-gompi-2017c.eb
new file mode 100644
index 00000000..8ee8059c
--- /dev/null
+++ b/h/HDF5/HDF5-1.10.4-gompi-2017c.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2019
+
+name = 'HDF5'
+version = '1.10.4'
+versionsuffix = '-parallel'
+
+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': 'gompi', 'version': '2017c'}
+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]
+
+configopts = " --enable-parallel --enable-shared "
+configopts += " --enable-static --enable-fortran "
+configopts += " --enable-hl --with-zlib=$EBROOTZLIB"
+
+dependencies = [
+    ('zlib', '1.2.11', '', True),
+    ('Szip', '2.1', '', True),
+]
+
+moduleclass = 'data'
diff --git a/h/h5py/h5py-2.9.0-Py-3.6.eb b/h/h5py/h5py-2.9.0-Py-3.6.eb
new file mode 100644
index 00000000..d2f065e8
--- /dev/null
+++ b/h/h5py/h5py-2.9.0-Py-3.6.eb
@@ -0,0 +1,25 @@
+# IT4Innovations 2019
+
+easyblock = 'PythonPackage'
+
+name = 'h5py'
+version = '2.9.0'
+
+homepage = 'https://github.com/jupyter/testpath'
+description = """Test utilities for code working with files and commands"""
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('HDF5', '1.10.4', '-parallel', ('gompi', '2017c')),
+    ('numpy', '1.15.4'),
+    ('mpi4py', '3.0.1'),  # required for MPI support
+    ('six', '1.11.0'),
+]
+
+sanity_check_paths = {'files': [], 'dirs': [
+    'lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg'], }
+moduleclass = 'python'
diff --git a/l/libGLU/libGLU-9.0.0-GCC-6.3.0-2.27.eb b/l/libGLU/libGLU-9.0.0-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..3c01ce34
--- /dev/null
+++ b/l/libGLU/libGLU-9.0.0-GCC-6.3.0-2.27.eb
@@ -0,0 +1,29 @@
+# IT4Innovations 2018
+
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://ftp.iij.ad.jp/pub/X11/x.org/pub/mesa/glu/'
+]
+sources = ['glu-%(version)s.tar.gz']
+
+dependencies = [(
+    'Mesa', '18.1.3') # GL.h
+]
+
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/l/libxml2/libxml2-2.9.9.eb b/l/libxml2/libxml2-2.9.9.eb
new file mode 100644
index 00000000..97dd6178
--- /dev/null
+++ b/l/libxml2/libxml2-2.9.9.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.9'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+preconfigopts = 'export LDFLAGS="-L$EBROOTZLIB/lib" && '
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+
+dependencies = [('zlib', '1.2.11')]
+
+moduleclass = 'lib'
diff --git a/l/libxslt/libxslt-1.1.33.eb b/l/libxslt/libxslt-1.1.33.eb
new file mode 100644
index 00000000..1aeac331
--- /dev/null
+++ b/l/libxslt/libxslt-1.1.33.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'libxslt'
+version = '1.1.33'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxslt is the XSLT C library developed for the GNOME project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('libxml2', '2.9.9'),
+]
+
+moduleclass = 'lib'
diff --git a/l/libyaml/libyaml-0.1.7.eb b/l/libyaml/libyaml-0.1.7.eb
old mode 100755
new mode 100644
diff --git a/l/libyaml/libyaml-0.2.1.eb b/l/libyaml/libyaml-0.2.1.eb
new file mode 100644
index 00000000..a330ea47
--- /dev/null
+++ b/l/libyaml/libyaml-0.2.1.eb
@@ -0,0 +1,21 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'libyaml'
+version = '0.2.1'
+
+homepage = 'http://pyyaml.org/wiki/LibYAML'
+description = """LibYAML is a YAML 1.1 parser and emitter written in C."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['yaml-%(version)s.tar.gz']
+source_urls = ['http://pyyaml.org/download/libyaml/']
+
+sanity_check_paths = {
+    'files': ["include/yaml.h", "lib/libyaml.a", "lib/libyaml.%s" % SHLIB_EXT],
+    'dirs': ["lib/pkgconfig"]
+}
+
+moduleclass = 'lib'
diff --git a/l/lxml/lxml-4.3.0-Py-3.6.eb b/l/lxml/lxml-4.3.0-Py-3.6.eb
new file mode 100644
index 00000000..7c1c8248
--- /dev/null
+++ b/l/lxml/lxml-4.3.0-Py-3.6.eb
@@ -0,0 +1,24 @@
+# IT4Innovations 2019
+
+easyblock = "PythonPackage"
+
+name = 'lxml'
+version = '4.3.0'
+
+homepage = 'http://lxml.de/'
+description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libxml2', '2.9.9', '', True),
+    ('libxslt', '1.1.33', '', True),
+]
+
+sanity_check_paths = {'files': [], 'dirs': [
+    ('lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg')]}
+
+moduleclass = 'python'
diff --git a/m/matplotlib/matplotlib-3.0.2-Py-3.6.eb b/m/matplotlib/matplotlib-3.0.2-Py-3.6.eb
new file mode 100644
index 00000000..b4a9fc30
--- /dev/null
+++ b/m/matplotlib/matplotlib-3.0.2-Py-3.6.eb
@@ -0,0 +1,29 @@
+# IT4Innovations 2019
+
+easyblock = "PythonPackage"
+name = 'matplotlib'
+version = '3.0.2'
+
+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': '3.6'}
+
+source_urls = ['https://github.com/matplotlib/matplotlib/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('freetype', '2.9.1', '-libpng-1.6.34', True),
+    ('libpng', '1.6.34', '', True),
+    ('python-dateutil', '2.6.1'),
+    ('numpy', '1.15.4'),
+    ('pyparsing', '2.2.0'),
+    ('six', '1.11.0'),
+]
+
+sanity_check_paths = {'files': [], 'dirs': [
+    'lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg/%(name)s'], }
+
+moduleclass = 'python'
diff --git a/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb b/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb
new file mode 100644
index 00000000..223aae77
--- /dev/null
+++ b/m/mpi4py/mpi4py-3.0.1-Py-3.6.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2018
+
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '3.0.1'
+
+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': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('gompi', '2017c', '', True),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/mpi4py'],
+}
+
+moduleclass = 'python'
diff --git a/o/OpenFOAM/OpenFOAM-5.0-intel-2017a-uv.eb b/o/OpenFOAM/OpenFOAM-5.0-intel-2017a-uv.eb
deleted file mode 100644
index 3231a404..00000000
--- a/o/OpenFOAM/OpenFOAM-5.0-intel-2017a-uv.eb
+++ /dev/null
@@ -1,41 +0,0 @@
-# IT4Innovations 2018
-
-name = 'OpenFOAM'
-version = '5.0'
-
-homepage = 'http://www.openfoam.com/'
-description = """OpenFOAM is a free, open source CFD software package.
- OpenFOAM has an extensive range of features to solve anything from complex fluid flows
- involving chemical reactions, turbulence and heat transfer,
- to solid dynamics and electromagnetics."""
-
-toolchain = {'name': 'intel', 'version': '2017a'}
-toolchainopts = {'cstd': 'c++11'}
-
-source_urls = [
-    'https://github.com/OpenFOAM/OpenFOAM-%(version_major)s.x/archive']
-sources = ['version-%(version)s.tar.gz']
-
-patches = ['OpenFOAM-%(version)s-cleanup.patch']
-
-dependencies = [
-    ('libreadline', '7.0', '', True),
-    ('ncurses', '6.0', '', True),
-    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
-    ('METIS', '5.1.0'),
-    ('SCOTCH', '6.0.5a'),
-    ('CGAL', '4.8.1'),
-    # Maximum ParaView version 5.2! (ADD_PARAVIEW_OBJECT_PANEL is no longer
-    # supported)
-    ('ParaView', '5.4.1', '-mpi'),
-]
-
-builddependencies = [
-    ('Bison', '3.0.4', '', True),
-    ('CMake', '3.7.2', '', True),
-    ('flex', '2.6.0', '', True),
-]
-
-modextrapaths = {'PATH': 'OpenFOAM-%(version)s/bin'}
-
-moduleclass = 'cae'
diff --git a/o/OpenMPI/OpenMPI-2.0.2-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-2.0.2-GCC-6.3.0-2.27.eb
index 4ee579c5..4a0f8945 100644
--- a/o/OpenMPI/OpenMPI-2.0.2-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-2.0.2-GCC-6.3.0-2.27.eb
@@ -31,7 +31,7 @@ configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
 preconfigopts = 'export LIBS="-ldl" && '
 
 # needed for --with-verbs
-osdependencies = [('libibverbs-dev', 'libibverbs-devel'), ]
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
 libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
 
diff --git a/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb
index 76d74037..0e3c17f7 100644
--- a/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb
@@ -12,9 +12,9 @@ source_urls = [
     'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
 
-builddependencies = [
-    ('Java', '1.8.0_121', '', True)
-]
+#builddependencies = [
+#    ('Java', '1.8.0_121', '', True)
+#]
 
 dependencies = [
     ('hwloc', '1.11.7')
@@ -30,11 +30,11 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 # configopts += '--disable-dlopen '  # dont disable dlopen!
 # https://github.com/open-mpi/ompi/issues/3630
 configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
-configopts += '--enable-mpi-java '  # Java support RT#4090
+#configopts += '--enable-mpi-java '  # Java support RT#4090
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 
 # needed for --with-verbs
-osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
 libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
 sanity_check_paths = {
diff --git a/p/ParaView/ParaView-5.4.1-foss-2017a-mpi-uv.eb b/p/ParaView/ParaView-5.4.1-foss-2017a-mpi-uv.eb
deleted file mode 100644
index 3858e2f1..00000000
--- a/p/ParaView/ParaView-5.4.1-foss-2017a-mpi-uv.eb
+++ /dev/null
@@ -1,62 +0,0 @@
-# IT4Innovations 2019
-# UV1
-
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.4.1'
-versionsuffix = '-mpi'
-
-homepage = "http://www.paraview.org"
-description = "ParaView is a scientific parallel visualizer."
-
-toolchain = {'name': 'foss', 'version': '2017a'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
-source_urls = [
-    'http://www.paraview.org/paraview-downloads/%s' %
-    download_suffix]
-sources = ["ParaView-v%(version)s.tar.gz"]
-checksums = ['390d0f5dc66bf432e202a39b1f34193af4bf8aad2355338fa5e2778ea07a80e4']
-
-dependencies = [
-    ('X11', '20160819', '', True),
-    ('Mesa', '18.1.3', '', ('GCC', '6.3.0-2.27')),
-    ('libGLU', '9.0.0', '', True),
-    ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
-    ('zlib', '1.2.11', '', True),
-    ('HDF5', '1.10.2'),
-    ('Python', '2.7.13', '', True),
-]
-
-builddependencies = [
-#    ('CMake', '3.11.4', '', ('GCC', '6.3.0-2.27'))
-    ('CMake', '3.9.1', '', True)
-]
-
-separate_build_dir = True
-
-configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
-configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s ' % SHLIB_EXT
-configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.%s ' % SHLIB_EXT
-configopts += '-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s ' % SHLIB_EXT
-configopts += '-DVTK_USE_SYSTEM_HDF5=ON -DPARAVIEW_ENABLE_PYTHON=ON -DBUILD_SHARED_LIBS=ON '
-# if you want to build server only Paraview, uncomment the following line:
-# configopts += '-DVTK_USE_X=OFF '
-
-# Without internet connection turn off testing (uncomment the following line)
-configopts += '-DBUILD_TESTING=OFF '
-# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-# Without internet connection, comment the following two lines (configopts
-# and prebuildopts)
-configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-
-configopts += ' -DPARAVIEW_QT_VERSION=5 -DQT_QMAKE_EXECUTABLE=$EBROOTQT5/bin/qmake '
-# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-# first serial attempt would fail.
-prebuildopts = 'make VTKData ;'
-
-moduleclass = 'vis'
diff --git a/p/ParaView/ParaView-5.4.1-intel-2017a-mpi-uv.eb b/p/ParaView/ParaView-5.4.1-intel-2017a-mpi-uv.eb
deleted file mode 100644
index 19c1e4c8..00000000
--- a/p/ParaView/ParaView-5.4.1-intel-2017a-mpi-uv.eb
+++ /dev/null
@@ -1,57 +0,0 @@
-# IT4Innovations
-
-easyblock = 'CMakeMake'
-
-name = 'ParaView'
-version = '5.4.1'
-versionsuffix = '-mpi'
-
-homepage = "http://www.paraview.org"
-description = "ParaView is a scientific parallel visualizer."
-
-toolchain = {'name': 'intel', 'version': '2017a'}
-toolchainopts = {'pic': True, 'usempi': True}
-
-download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
-source_urls = [
-    'http://www.paraview.org/paraview-downloads/%s' %
-    download_suffix]
-sources = ["ParaView-v%(version)s.tar.gz"]
-
-patches = ['ParaView-5.4.1-Qt.patch']
-
-dependencies = [
-    ('X11', '20160819', '', True),
-    ('Mesa', '12.0.2'),
-    ('libGLU', '9.0.0', '', True),
-    ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
-    ('zlib', '1.2.11', '', True),
-    ('HDF5', '1.8.17'),
-    ('Python', '2.7.13', '', True),
-]
-
-builddependencies = [('CMake', '3.9.1', '', True)]
-
-separate_build_dir = True
-
-configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
-configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s ' % SHLIB_EXT
-configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.%s ' % SHLIB_EXT
-configopts += '-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s ' % SHLIB_EXT
-configopts += '-DVTK_USE_SYSTEM_HDF5=ON -DPARAVIEW_ENABLE_PYTHON=ON -DBUILD_SHARED_LIBS=ON -DVTK_RENDERING_BACKEND=OpenGL2 '
-configopts += '-DPARAVIEW_QT_VERSION=5 '
-# if you want to build server only Paraview, uncomment the following line:
-# configopts += '-DVTK_USE_X=OFF '
-
-# Without internet connection turn off testing (uncomment the following line)
-configopts += '-DBUILD_TESTING=OFF '
-# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-# Without internet connection, comment the following two lines (configopts and prebuildopts)
-#configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-# first serial attempt would fail.
-#prebuildopts = 'make VTKData ;'
-
-moduleclass = 'vis'
diff --git a/p/ParaView/ParaView-5.4.1-intel-2017a-mpi.eb b/p/ParaView/ParaView-5.4.1-intel-2017a-mpi.eb
index 92361a98..b210e5d4 100644
--- a/p/ParaView/ParaView-5.4.1-intel-2017a-mpi.eb
+++ b/p/ParaView/ParaView-5.4.1-intel-2017a-mpi.eb
@@ -23,7 +23,7 @@ patches = ['ParaView-5.4.1-Qt.patch']
 dependencies = [
     ('X11', '20170314', '', True),
     ('Mesa', '18.1.3', '', ('GCC', '6.3.0-2.27')),
-    ('libGLU', '9.0.0', '', True),
+    ('libGLU', '9.0.0', '', ('GCC', '6.3.0-2.27')),
     ('Qt5', '5.11.1', '', ('GCC', '6.3.0-2.27')),
     ('zlib', '1.2.11', '', True),
     ('HDF5', '1.8.17'),
diff --git a/p/PyYAML/PyYAML-3.13-Py-3.6.eb b/p/PyYAML/PyYAML-3.13-Py-3.6.eb
new file mode 100644
index 00000000..82cbbd19
--- /dev/null
+++ b/p/PyYAML/PyYAML-3.13-Py-3.6.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2019
+
+easyblock = "PythonPackage"
+
+name = "PyYAML"
+version = "3.13"
+
+homepage = "https://pypi.python.org/pypi/PyYAML/"
+description = """PyYAML is a YAML parser and emitter for the Python programming language."""
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libyaml', '0.2.1', '', True),
+]
+
+options = {'modulename': 'yaml'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/yaml'],
+}
+
+moduleclass = 'python'
diff --git a/q/Qt5/Qt5-5.11.1-GCC-6.3.0-2.27.eb b/q/Qt5/Qt5-5.11.1-GCC-6.3.0-2.27.eb
index 3c856895..547f63ed 100644
--- a/q/Qt5/Qt5-5.11.1-GCC-6.3.0-2.27.eb
+++ b/q/Qt5/Qt5-5.11.1-GCC-6.3.0-2.27.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('GLib', '2.57.1', '', True),
     ('libpng', '1.6.34', '', True),
     ('X11', '20170314', '', True),
-    ('libGLU', '9.0.0', '', True),
+    ('libGLU', '9.0.0'),
     ('Mesa', '18.1.3'),
 ]