diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
index 1536146190d3..184de98e3315 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
 ]
 checksums = [
     '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',  # openmpi-4.0.5.tar.gz
@@ -20,6 +21,7 @@ checksums = [
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
     # OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch
     '7d8695f0d23453c82638ad33b18e41690274d5c7784291213e98335b42c54578',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-9.3.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-9.3.0.eb
index c399450ab49a..c62a1b54501d 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-9.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-GCC-9.3.0.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
 ]
 checksums = [
     '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',  # openmpi-4.0.5.tar.gz
@@ -20,6 +21,7 @@ checksums = [
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
     # OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch
     '7d8695f0d23453c82638ad33b18e41690274d5c7784291213e98335b42c54578',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.1.eb
index 383370dd6f52..bb1fb2730aca 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.1.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.1.eb
@@ -14,6 +14,7 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
 ]
 checksums = [
     '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',  # openmpi-4.0.5.tar.gz
@@ -22,6 +23,7 @@ checksums = [
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
     # OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch
     '7d8695f0d23453c82638ad33b18e41690274d5c7784291213e98335b42c54578',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
index 3746daadf8e7..838b2563b31f 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
 ]
 checksums = [
     '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',  # openmpi-4.0.5.tar.gz
@@ -20,6 +21,7 @@ checksums = [
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
     # OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch
     '7d8695f0d23453c82638ad33b18e41690274d5c7784291213e98335b42c54578',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
index de0f5b3d2e19..08a4dbccb2d6 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
@@ -12,6 +12,7 @@ patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
     'OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
 ]
 checksums = [
     '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',  # openmpi-4.0.5.tar.gz
@@ -20,6 +21,7 @@ checksums = [
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
     # OpenMPI-4.0.5-6-pml-ucx-datatype-memleak.patch
     '7d8695f0d23453c82638ad33b18e41690274d5c7784291213e98335b42c54578',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5_fix-MS_RDONLY-error.patch b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5_fix-MS_RDONLY-error.patch
new file mode 100644
index 000000000000..89df2e3ff365
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.5_fix-MS_RDONLY-error.patch
@@ -0,0 +1,47 @@
+From 5b525b251c3433bf50b44b05c84937a39fb10074 Mon Sep 17 00:00:00 2001
+From: Bert Wesarg <bert.wesarg@tu-dresden.de>
+Date: Tue, 23 Feb 2021 08:21:22 +0100
+Subject: [PATCH] fs/lustre: Remove unneeded includes
+
+The functionality was migrated to `fs/base/fs_base_get_parent_dir.c` long
+ago, but the includes stayed. Though in lustre 2.14 `lustre_user.h`
+moved the inclusion of `linux/fs.h` outside the `__KERNEL__` guard. This
+triggered now Debian bug #898743 [1], which states that including
+`sys/mount.h` after `linux/fs.h` breaks compilation. Thus the include
+removal also avoids this breakage.
+
+Closes #8508.
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898743
+
+Signed-off-by: Bert Wesarg <bert.wesarg@tu-dresden.de>
+---
+ ompi/mca/fs/lustre/fs_lustre.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/ompi/mca/fs/lustre/fs_lustre.c b/ompi/mca/fs/lustre/fs_lustre.c
+index df2c7c3ac7c..20fdfc76991 100644
+--- a/ompi/mca/fs/lustre/fs_lustre.c
++++ b/ompi/mca/fs/lustre/fs_lustre.c
+@@ -32,21 +32,6 @@
+ #include "ompi/mca/fs/base/base.h"
+ #include "ompi/mca/fs/lustre/fs_lustre.h"
+ 
+-#ifdef HAVE_SYS_STATFS_H
+-#include <sys/statfs.h> /* or <sys/vfs.h> */
+-#endif
+-#ifdef HAVE_SYS_PARAM_H
+-#include <sys/param.h>
+-#endif
+-#ifdef HAVE_SYS_MOUNT_H
+-#include <sys/mount.h>
+-#endif
+-#ifdef HAVE_SYS_STAT_H
+-#include <sys/stat.h>
+-#endif
+-
+-#include <sys/ioctl.h>
+-
+ /*
+  * *******************************************************************
+  * ************************ actions structure ************************