diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
index dc5286d33624..c6e650ef6e6e 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
@@ -10,12 +10,14 @@ source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/
 sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
 ]
 checksums = [
     '6346bf976001ad274c7e018d6cc35c92bbb9426d8f7754fac00a17ea5ac8eebc',  # openmpi-4.0.3.tar.gz
     # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
     'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-gcccuda-2020a.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-gcccuda-2020a.eb
index a9103a8a934b..6eb936f50adc 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-gcccuda-2020a.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-gcccuda-2020a.eb
@@ -10,12 +10,14 @@ source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/
 sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
 ]
 checksums = [
     '6346bf976001ad274c7e018d6cc35c92bbb9426d8f7754fac00a17ea5ac8eebc',  # openmpi-4.0.3.tar.gz
     # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
     'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifort-2020.1.217.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifort-2020.1.217.eb
index 75c1dbb91952..435d229f4f09 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifort-2020.1.217.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifort-2020.1.217.eb
@@ -10,12 +10,14 @@ source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/
 sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
 ]
 checksums = [
     '6346bf976001ad274c7e018d6cc35c92bbb9426d8f7754fac00a17ea5ac8eebc',  # openmpi-4.0.3.tar.gz
     # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
     'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifortcuda-2020a.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifortcuda-2020a.eb
index 564f903d56a3..8acb43b7ce6d 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifortcuda-2020a.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.0.3-iccifortcuda-2020a.eb
@@ -10,12 +10,14 @@ source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/
 sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
+    'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch',
     'OpenMPI-4.x_fix_pmix_discovery.patch',
 ]
 checksums = [
     '6346bf976001ad274c7e018d6cc35c92bbb9426d8f7754fac00a17ea5ac8eebc',  # openmpi-4.0.3.tar.gz
     # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
     'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
+    {'OpenMPI-4.0.5_fix-MS_RDONLY-error.patch': 'b4cd3d947cd4f3d47c7cf531c2b4bcdaa5d6db1ec024a0a97f5a3b42c95f6b82'},
     '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
 ]
 
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 ************************