diff --git a/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb b/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb
new file mode 100644
index 00000000..f12f28d7
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb
@@ -0,0 +1,52 @@
+# IT4Innovations 2020
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '3.1.6'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
+
+source_urls = [
+    'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('hwloc', '1.11.12'),
+    ('zlib', '1.2.11'),
+    ('binutils', '2.32'),
+    ('UCX', '1.6.1'),
+]
+
+configopts = '--with-tm=/opt/pbs '  # Enable PBS
+configopts += '--with-ucx=$EBROOTUCX '
+
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+    'files': [
+        "bin/%s" %
+        binfile for binfile in [
+            "ompi_info", "opal_wrapper", "orterun"]] + [
+                "lib/lib%s.%s" %
+                (libfile, SHLIB_EXT) for libfile in libs] + [
+                    "include/%s.h" %
+                    x for x in [
+                        "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
+moduleclass = 'mpi'