diff --git a/m/MCR/MCR-R2015b.eb b/m/MCR/MCR-R2015b.eb
new file mode 100644
index 00000000..7849c4e6
--- /dev/null
+++ b/m/MCR/MCR-R2015b.eb
@@ -0,0 +1,21 @@
+# IT4Innovations 2021
+# LK
+
+name = 'MCR'
+version = 'R2015b'
+
+homepage = 'http://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = SYSTEM
+
+source_urls = [
+    'http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/',
+]
+sources = ['%(name)s_%(version)s_glnxa64_installer.zip']
+
+dependencies = [('Java', '1.8.0_221')]
+
+moduleclass = 'math'
diff --git a/m/MCR/MCR-R2021a.0.eb b/m/MCR/MCR-R2021a.0.eb
new file mode 100644
index 00000000..20dee895
--- /dev/null
+++ b/m/MCR/MCR-R2021a.0.eb
@@ -0,0 +1,21 @@
+# IT4Innovations 2021
+# LK
+
+name = 'MCR'
+version = 'R2021a'
+local_update = '0'
+versionsuffix = '.%s' % local_update
+
+homepage = 'https://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://ssd.mathworks.com/supportfiles/downloads/%%(version)s/Release/%s/deployment_files/'
+               'installer/complete/glnxa64/' % local_update]
+sources = ['MATLAB_Runtime_%(version)s_glnxa64.zip']
+checksums = ['f971843a7c1d06f10471859bd4eed8ecf374346e4a1b4f8be290aa279a2c6f1c']
+
+moduleclass = 'math'
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
index f2e4ac8a..3797ba42 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
@@ -17,11 +17,7 @@ sources = ['v4.0.4.tar.gz']
 
 dependencies = [
     ('hwloc', '2.2.0'),
-    ('zlib', '1.2.11'),
     ('UCX', '1.9.0',),
-    ('libfabric', '1.11.0'),
-    ('PMIx', '3.1.5'),
-    ('libevent', '2.1.12'),
     ('Java', '1.8.0_221', '', True),
 ]