diff --git a/b/Boost/Boost-1.68.0-intel-2018a.eb b/b/Boost/Boost-1.68.0-intel-2018a.eb
new file mode 100644
index 00000000..4fd474c8
--- /dev/null
+++ b/b/Boost/Boost-1.68.0-intel-2018a.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2020
+
+name = 'Boost'
+version = '1.68.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2018a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+
+dependencies = [
+    ('bzip2', '1.0.6', '', True),
+    ('zlib', '1.2.11', '', True),
+]
+
+configopts = '--without-libraries=python'
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/f/fontconfig/fontconfig-2.13.0.eb b/f/fontconfig/fontconfig-2.13.0.eb
index 2726ddc8..e20c99b8 100644
--- a/f/fontconfig/fontconfig-2.13.0.eb
+++ b/f/fontconfig/fontconfig-2.13.0.eb
@@ -22,6 +22,7 @@ dependencies = [
     ('freetype', '2.9.1'),
     ('expat', '2.2.0'),
     ('LibUUID', '1.0.3'),
+    ('gperf', '3.1'),
 ]
 
 configopts = '--disable-docs '
diff --git a/l/libGLU/libGLU-9.0.0-GCC-8.3.0-2.32.eb b/l/libGLU/libGLU-9.0.0-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..aea9e368
--- /dev/null
+++ b/l/libGLU/libGLU-9.0.0-GCC-8.3.0-2.32.eb
@@ -0,0 +1,29 @@
+# IT4Innovations 2020
+
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a local_computer graphics library for OpenGL. """
+
+toolchain = {'name': 'GCC', 'version': '8.3.0-2.32'}
+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.3.1', '', True)
+]
+
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/l/libGLU/libGLU-9.0.0.eb b/l/libGLU/libGLU-9.0.0.eb
index 2698d682..9f3c5717 100644
--- a/l/libGLU/libGLU-9.0.0.eb
+++ b/l/libGLU/libGLU-9.0.0.eb
@@ -8,7 +8,7 @@ version = '9.0.0'
 homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
 description = """The OpenGL Utility Library (GLU) is a local_computer graphics library for OpenGL. """
 
-toolchain = SYSTEM
+toolchain = {
 toolchainopts = {'pic': True}
 
 source_urls = [
diff --git a/l/libdrm/libdrm-2.4.76.eb b/l/libdrm/libdrm-2.4.76.eb
index 9c31f71a..fdd7bddf 100644
--- a/l/libdrm/libdrm-2.4.76.eb
+++ b/l/libdrm/libdrm-2.4.76.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2020
+
 easyblock = 'ConfigureMake'
 
 name = 'libdrm'
@@ -12,7 +14,7 @@ sources = [SOURCELOWER_TAR_GZ]
 toolchain = SYSTEM
 
 dependencies = [
-    ('X11', '20170314'),
+    ('X11', '20190717'),
 ]
 
 sanity_check_paths = {
diff --git a/m/Mako/Mako-1.0.6-Py-2.7.eb b/m/Mako/Mako-1.0.6-Py-2.7.eb
index f2865c24..1ed55405 100644
--- a/m/Mako/Mako-1.0.6-Py-2.7.eb
+++ b/m/Mako/Mako-1.0.6-Py-2.7.eb
@@ -18,7 +18,7 @@ dependencies = [('Py', '2.7')]
 
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python2.7s/site-packages/%(name)s-%(version)s-py2.7.egg'],
+    'dirs': ['lib/python2.7/site-packages'],
 }
 
 moduleclass = 'devel'
diff --git a/m/Mesa/Mesa-18.3.1.eb b/m/Mesa/Mesa-18.3.1.eb
index 6805e3b3..8d43cc06 100644
--- a/m/Mesa/Mesa-18.3.1.eb
+++ b/m/Mesa/Mesa-18.3.1.eb
@@ -1,4 +1,4 @@
-# IT4Innovations 2018
+# IT4Innovations 2020
 
 easyblock = 'ConfigureMake'
 
@@ -28,7 +28,7 @@ builddependencies = [
     ('Bison', '3.0.5', '', True),
     ('Autotools', '20180311', '', True),
     ('pkg-config', '0.29.2', '', True),
-    ('Mako', '1.0.6', '-Python-2.7.14-base', True),
+    ('Mako', '1.0.6', '-Py-2.7', True),
     ('libxml2', '2.9.4', '', True),
 ]
 
@@ -36,8 +36,8 @@ dependencies = [
     ('zlib', '1.2.11', '', True),
     ('nettle', '3.4.1'),
     ('libdrm', '2.4.76', '', True),
-    ('LLVM', '6.0.1'),
-    ('X11', '20170314', '', True),
+    ('LLVM', '9.0.0', '', ('GCCcore' , '8.3.0')),
+    ('X11', '20190717', '', True),
     ('expat', '2.2.0', '', True),
 ]
 
diff --git a/o/osm2pgsql/osm2pgsql-1.2.1-intel-2018a.eb b/o/osm2pgsql/osm2pgsql-1.2.1-intel-2018a.eb
new file mode 100644
index 00000000..47cd7908
--- /dev/null
+++ b/o/osm2pgsql/osm2pgsql-1.2.1-intel-2018a.eb
@@ -0,0 +1,44 @@
+# IT4Innovations 2020
+
+easyblock = 'CMakeMake'
+
+name = 'osm2pgsql'
+version = '1.2.1'
+
+homepage = 'http://wiki.openstreetmap.org/wiki/Osm2pgsql'
+description = "osm2pgsql is a command-line based program that converts OpenStreetMap data to postGIS-enabled PostgreSQL databases"
+
+toolchain = {'name': 'intel', 'version': '2018a'}
+
+source_urls = ['https://github.com/openstreetmap/osm2pgsql/archive/']
+sources = ['%(version)s.tar.gz']
+
+#patches = ['osm2pgsql-%(version)s_fix.patch']
+
+files_to_copy = ['%(builddir)s/osm2pgsql']
+
+configopts = '-DCMAKE_CXX_COMPILER=icpc -DCMAKE_CXX_FLAGS=-std=c++11'
+
+separate_build_dir = True
+
+builddependencies = [
+    ('CMake', '3.16.2', '', True)
+]
+
+dependencies = [
+    ('expat', '2.2.6', '', True),
+    ('PROJ_4', '4.9.2', '', True),
+    ('GEOS', '3.7.1', '-Py-2.7', True),
+    ('zlib', '1.2.11', '', True),
+    ('Boost', '1.68.0'),
+    ('Lua', '5.1.4-8', '', True),
+    ('bzip2', '1.0.6', '', True),
+    ('PostgreSQL', '11.3', '-Py-2.7', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/osm2pgsql'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb b/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
index 2c82887c..c0ea8cfb 100644
--- a/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
+++ b/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
@@ -11,7 +11,11 @@ description = "Valgrind: Debugging and profiling tools"
 toolchain = {'name': 'intel', 'version': '2017c'}
 toolchainopts = {'optarch': False}
 
+<<<<<<< HEAD
 source_urls = ['https://sourceware.org/pub/valgrind/']
+=======
+source_urls = ['https://sourceware.org/ftp/valgrind/']
+>>>>>>> 07c6f00c30a09695fc9b7bcf37cfdd05362445a7
 sources = [SOURCELOWER_TAR_BZ2]
 
 configopts = ' --with-mpicc="$MPICC"'
@@ -26,4 +30,9 @@ sanity_check_paths = {
     'dirs': []
 }
 
+<<<<<<< HEAD
+=======
+parallel = 1
+
+>>>>>>> 07c6f00c30a09695fc9b7bcf37cfdd05362445a7
 moduleclass = 'debugger'
diff --git a/v/VirtualGL/VirtualGL-2.6.1-GCC-8.3.0-2.32.eb b/v/VirtualGL/VirtualGL-2.6.1-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..3bcd39d4
--- /dev/null
+++ b/v/VirtualGL/VirtualGL-2.6.1-GCC-8.3.0-2.32.eb
@@ -0,0 +1,35 @@
+# IT4Innovations 2020
+
+easyblock = 'CMakeMake'
+
+name = "VirtualGL"
+version = '2.6.1'
+
+homepage = 'http://www.virtualgl.org'
+description = """VirtualGL is an open source toolkit that gives any Unix or Linux remote display software the
+ability to run OpenGL applications with full 3D hardware acceleration."""
+
+# empty version to ensure that dependencies are loaded
+toolchain = {'name': 'GCC', 'version': '8.3.0-2.32'}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/VirtualGL/virtualgl/archive']
+
+dependencies = [
+        ('Mesa', '18.3.1', '', True),
+        ('libjpeg-turbo', '1.5.3', '', True),
+        ('libGLU', '9.0.0'),
+]
+
+builddependencies = [
+        ('CMake', '3.16.2', '', True),
+]
+
+#skipsteps = ['source', 'patch', 'prepare', 'configure', 'build', 'test']
+
+sanity_check_paths = {
+    'files': ['bin/vglrun'],
+    'dirs': ['']
+}
+
+moduleclass = 'tools'
diff --git a/v/VirtualGL/VirtualGL-2.6.3.eb b/v/VirtualGL/VirtualGL-2.6.3.eb
new file mode 100644
index 00000000..455bf1a2
--- /dev/null
+++ b/v/VirtualGL/VirtualGL-2.6.3.eb
@@ -0,0 +1,35 @@
+# IT4Innovations 2020
+
+easyblock = 'CMakeMake'
+
+name = "VirtualGL"
+version = '2.6.3'
+
+homepage = 'http://www.virtualgl.org'
+description = """VirtualGL is an open source toolkit that gives any Unix or Linux remote display software the
+ability to run OpenGL applications with full 3D hardware acceleration."""
+
+# empty version to ensure that dependencies are loaded
+toolchain = SYSTEM
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/VirtualGL/virtualgl/archive']
+
+dependencies = [
+        ('Mesa', '18.3.1'),
+        ('libjpeg-turbo', '1.5.3'),
+        ('libGLU', '9.0.0', '', ('GCC', '8.3.0-2.32')),
+]
+
+builddependencies = [
+        ('CMake', '3.16.2'),
+]
+
+#skipsteps = ['source', 'patch', 'prepare', 'configure', 'build', 'test']
+
+sanity_check_paths = {
+    'files': ['bin/vglrun'],
+    'dirs': ['']
+}
+
+moduleclass = 'tools'