diff --git a/f/foss/foss-2017b.eb b/f/foss/foss-2017b.eb
index 3d59879a..e731b338 100644
--- a/f/foss/foss-2017b.eb
+++ b/f/foss/foss-2017b.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = 'Toolchain'
 
 name = 'foss'
@@ -24,7 +26,7 @@ local_comp_mpi_tc = (local_comp_mpi_tc_name, version)
 # For local_binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
 dependencies = [
     ('GCC', local_gccver),
-    ('OpenMPI', '2.1.1', '', ('GCC', local_gccver)),
+    ('OpenMPI', '2.1.5', '', ('GCC', local_gccver)),
     (local_blaslib, local_blasver, '', ('GCC', local_gccver)),
     ('FFTW', '3.3.6', '', local_comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', '-%s' % blas, local_comp_mpi_tc),
diff --git a/f/foss/foss-2018a.eb b/f/foss/foss-2018a.eb
index 27ea718e..0cac4457 100644
--- a/f/foss/foss-2018a.eb
+++ b/f/foss/foss-2018a.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = 'Toolchain'
 
 name = 'foss'
@@ -24,7 +26,7 @@ local_comp_mpi_tc = (local_comp_mpi_tc_name, version)
 # For local_binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
 dependencies = [
     ('GCC', local_gccver),
-    ('OpenMPI', '3.0.0', '', ('GCC', local_gccver)),
+    ('OpenMPI', '3.1.4', '', ('GCC', local_gccver)),
     (local_blaslib, local_blasver, '', ('GCC', local_gccver)),
     ('FFTW', '3.3.7', '', local_comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', '-%s' % blas, local_comp_mpi_tc),
diff --git a/g/gompi/gompi-2017b.eb b/g/gompi/gompi-2017b.eb
index d95730ec..df0a45e6 100644
--- a/g/gompi/gompi-2017b.eb
+++ b/g/gompi/gompi-2017b.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = "Toolchain"
 
 name = 'gompi'
@@ -14,7 +16,7 @@ local_gccver = '6.3.0-2.27'
 # local_compiler toolchain dependencies
 dependencies = [
     ('GCC', local_gccver),  # includes both GCC and local_binutils
-    ('OpenMPI', '2.1.1', '', ('GCC', local_gccver)),
+    ('OpenMPI', '2.1.5', '', ('GCC', local_gccver)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/g/gompi/gompi-2018a.eb b/g/gompi/gompi-2018a.eb
index af423679..14773475 100644
--- a/g/gompi/gompi-2018a.eb
+++ b/g/gompi/gompi-2018a.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = "Toolchain"
 
 name = 'gompi'
@@ -14,7 +16,7 @@ local_gccver = '6.3.0-2.27'
 # local_compiler toolchain dependencies
 dependencies = [
     ('GCC', local_gccver),  # includes both GCC and local_binutils
-    ('OpenMPI', '3.0.0', '', ('GCC', local_gccver)),
+    ('OpenMPI', '3.1.4', '', ('GCC', local_gccver)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/h/hwloc/hwloc-1.11.7-GCC-8.3.0-2.32.eb b/h/hwloc/hwloc-1.11.7-GCCcore-8.3.0.eb
similarity index 88%
rename from h/hwloc/hwloc-1.11.7-GCC-8.3.0-2.32.eb
rename to h/hwloc/hwloc-1.11.7-GCCcore-8.3.0.eb
index 5e814fd8..a747a5d4 100644
--- a/h/hwloc/hwloc-1.11.7-GCC-8.3.0-2.32.eb
+++ b/h/hwloc/hwloc-1.11.7-GCCcore-8.3.0.eb
@@ -13,13 +13,16 @@ system attributes such as cache and memory information as well as the locality o
 network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
 information about modern local_computing hardware so as to exploit it accordingly and efficiently."""
 
-toolchain = {'name': 'GCC', 'version': '8.3.0-2.32'}
+toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
 
 source_urls = [
     'http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('numactl', '2.0.11')]
+dependencies = [
+   ('numactl', '2.0.11'),
+   ('binutils', '2.32'),
+]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
 
diff --git a/n/numactl/numactl-2.0.11-GCCcore-8.3.0.eb b/n/numactl/numactl-2.0.11-GCCcore-8.3.0.eb
new file mode 100644
index 00000000..6f5a08cb
--- /dev/null
+++ b/n/numactl/numactl-2.0.11-GCCcore-8.3.0.eb
@@ -0,0 +1,38 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+It does this by supplying a NUMA memory policy to the operating system before running your program.
+The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/numactl/numactl/archive/']
+sources = ['v2.0.12.tar.gz']
+checksums = ['a4d2292af28fb20007ddb9706f8bb1cc']
+
+builddependencies = [
+    ('binutils', '2.32'),
+    ('Autotools', '20180311', '', True),
+]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': [
+        'bin/numactl',
+        'bin/numastat',
+        'lib/libnuma.%s' %
+        SHLIB_EXT,
+        'lib/libnuma.a'],
+    'dirs': [
+        'share/man',
+        'include']}
+
+moduleclass = 'tools'
diff --git a/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27.eb
index dde92e0a..941a4989 100644
--- a/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = 'ConfigureMake'
 
 name = 'OpenMPI'
@@ -14,21 +16,13 @@ source_urls = [
 
 dependencies = [('hwloc', '1.11.7')]
 
-builddependencies = [
-    ('Java', '1.8.0_121', '', True)
-]
-
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
 # suppress failure modes in relation to mpirun path
 configopts += '--enable-mpirun-prefix-by-default '
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 # statically link local_component, don't do dynamic loading
 configopts += '--disable-dlopen '
-configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
-configopts += '--enable-mpi-java '  # Java support RT#4090
-
-# for PBS Pro 13
-preconfigopts = 'export LIBS="-ldl" && '
+configopts += '--with-tm=/opt/pbs '  # Enable PBS
 
 # needed for --with-verbs
 osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
diff --git a/o/OpenMPI/OpenMPI-2.1.5-GCC-8.3.0-2.32.eb b/o/OpenMPI/OpenMPI-2.1.5-GCC-8.3.0-2.32.eb
index 01da072f..7ef4bb72 100644
--- a/o/OpenMPI/OpenMPI-2.1.5-GCC-8.3.0-2.32.eb
+++ b/o/OpenMPI/OpenMPI-2.1.5-GCC-8.3.0-2.32.eb
@@ -15,7 +15,7 @@ source_urls = [
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
-    ('hwloc', '1.11.7')
+    ('hwloc', '1.11.7', '', ('GCCcore', '8.3.0'))
 ]
 
 configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
@@ -24,7 +24,7 @@ configopts += '--enable-mpirun-prefix-by-default '
 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 += '--with-tm=/opt/pbs '  # Enable PBS
 #configopts += '--enable-mpi-java '  # Java support RT#4090
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 
diff --git a/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
index 56a9b2ef..fe977123 100644
--- a/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
@@ -14,10 +14,6 @@ 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)
-]
-
 dependencies = [
     ('hwloc', '1.11.7'),
     ('zlib', '1.2.11', '', True),
@@ -30,8 +26,8 @@ configopts += '--enable-mpirun-prefix-by-default '
 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 += '--with-tm=/opt/pbs '  # Enable PBS
+#configopts += '--enable-mpi-java '  # Java support RT#4090
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 
 # for PBS Pro 13
diff --git a/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
index e429507a..a43a6af7 100644
--- a/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-4.0.0-GCC-6.3.0-2.27.eb
@@ -13,10 +13,6 @@ toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
 source_urls = ['https://github.com/open-mpi/ompi/archive/']
 sources = ['v4.0.0.tar.gz']
 
-#builddependencies = [
-#    ('Java', '1.8.0_144', '', True)
-#]
-
 dependencies = [
     ('hwloc', '2.0.3'),
     ('zlib', '1.2.11', '', True),
@@ -32,7 +28,7 @@ configopts += '--enable-mpirun-prefix-by-default '
 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 += '--with-tm=/opt/pbs '  # Enable PBS
 #configopts += '--enable-mpi-java '  # Java support RT#4090
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings