diff --git a/sys-cluster/openmpi/openmpi-4.0.1.recipe b/sys-cluster/openmpi/openmpi-4.1.0.recipe
similarity index 90%
rename from sys-cluster/openmpi/openmpi-4.0.1.recipe
rename to sys-cluster/openmpi/openmpi-4.1.0.recipe
index 126045257..efdcf631e 100644
--- a/sys-cluster/openmpi/openmpi-4.0.1.recipe
+++ b/sys-cluster/openmpi/openmpi-4.1.0.recipe
@@ -46,13 +46,13 @@ COPYRIGHT="2004-2010 The Trustees of Indiana University and Indiana \
 	2013-2017 Research Organization for Information Science (RIST)
 	2017 Amazon.com, Inc. or its affiliates"
 LICENSE="BSD (3-clause)"
-REVISION="3"
-SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-$portVersion.tar.bz2"
-CHECKSUM_SHA256="cce7b6d20522849301727f81282201d609553103ac0b09162cf28d102efb9709"
+REVISION="1"
+SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v${portVersion%.*}/openmpi-$portVersion.tar.bz2"
+CHECKSUM_SHA256="73866fb77090819b6a8c85cb8539638d37d6877455825b74e289d647a39fd5b5"
 PATCHES="openmpi-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 openmpiLibs="
 	libmca_common_dstore
@@ -67,17 +67,17 @@ openmpiLibs="
 	libopen_pal
 	libopen_rte
 	"
-libmca_common_dstoreVersion=1.0.0
-libmca_common_monitoringVersion=50.10.0
-libmca_common_ompioVersion=41.19.1
-libmca_common_smVersion=40.20.0
-libmpi_mpifhVersion=40.20.1
-libmpi_usempi_ignore_tkrVersion=40.20.0
-libmpi_usempif08Version=40.20.0
-libmpiVersion=40.20.1
-libompitraceVersion=40.20.0
-libopen_palVersion=40.20.1
-libopen_rteVersion=40.20.1
+libmca_common_dstoreVersion=1.0.2
+libmca_common_monitoringVersion=50.20.0
+libmca_common_ompioVersion=41.29.0
+libmca_common_smVersion=40.30.0
+libmpi_mpifhVersion=40.30.0
+libmpi_usempi_ignore_tkrVersion=40.30.0
+libmpi_usempif08Version=40.30.0
+libmpiVersion=40.30.0
+libompitraceVersion=40.30.0
+libopen_palVersion=40.30.0
+libopen_rteVersion=40.30.0
 for i in $openmpiLibs; do
 	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
 done
@@ -197,7 +197,9 @@ defineDebugInfoPackage openmpi$secondaryArchSuffix \
 
 BUILD()
 {
-	LDFLAGS="-lnetwork" runConfigure --omit-dirs "libExecDir" ./configure \
+	LDFLAGS="-lnetwork -lbsd" \
+	CFLAGS="-D_BSD_SOURCE" \
+	runConfigure --omit-dirs "libExecDir" ./configure \
 		--libexecdir="$libExecDir/openmpi" \
 		--with-libevent \
 		--with-hwloc=external \
diff --git a/sys-cluster/openmpi/patches/openmpi-4.0.1.patchset b/sys-cluster/openmpi/patches/openmpi-4.0.1.patchset
deleted file mode 100644
index 194fda165..000000000
--- a/sys-cluster/openmpi/patches/openmpi-4.0.1.patchset
+++ /dev/null
@@ -1,55 +0,0 @@
-From 201133ba37dec47855b83e062472f3f42d14f99a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Wed, 29 Aug 2018 20:51:09 +0200
-Subject: Haiku: user is effective root
-
----
- orte/orted/orted_submit.c    | 3 +++
- orte/tools/orterun/orterun.c | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
-index ccc089e..4f4905e 100644
---- a/orte/orted/orted_submit.c
-+++ b/orte/orted/orted_submit.c
-@@ -319,6 +319,8 @@ int orte_submit_init(int argc, char *argv[],
-         exit(0);
-     }
- 
-+#ifndef __HAIKU__
-+/* User is effective root on Haiku */
-     /* check if we are running as root - if we are, then only allow
-      * us to proceed if the allow-run-as-root flag was given. Otherwise,
-      * exit with a giant warning flag
-@@ -355,6 +357,7 @@ int orte_submit_init(int argc, char *argv[],
-         fprintf(stderr, "--------------------------------------------------------------------------\n");
-         exit(1);
-     }
-+#endif
- 
-   moveon:
-     /* process any mca params */
-diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
-index 85aba0a..34351ef 100644
---- a/orte/tools/orterun/orterun.c
-+++ b/orte/tools/orterun/orterun.c
-@@ -138,6 +138,8 @@ int orterun(int argc, char *argv[])
-         exit(1);
-     }
- 
-+#ifndef __HAIKU__
-+/* User is effective root on Haiku */
-     /* check if we are running as root - if we are, then only allow
-      * us to proceed if the allow-run-as-root flag was given. Otherwise,
-      * exit with a giant warning flag
-@@ -159,6 +161,7 @@ int orterun(int argc, char *argv[])
-         fprintf(stderr, "--------------------------------------------------------------------------\n");
-         exit(1);
-     }
-+#endif
- 
-     /* setup to listen for commands sent specifically to me, even though I would probably
-      * be the one sending them! Unfortunately, since I am a participating daemon,
--- 
-2.21.0
-
diff --git a/sys-cluster/openmpi/patches/openmpi-4.1.0.patchset b/sys-cluster/openmpi/patches/openmpi-4.1.0.patchset
new file mode 100644
index 000000000..98b9f3c23
--- /dev/null
+++ b/sys-cluster/openmpi/patches/openmpi-4.1.0.patchset
@@ -0,0 +1,30 @@
+From d69b3759b59128204163715eac22266784d017b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 6 Jan 2021 21:05:07 +0100
+Subject: Haiku: user is effective root
+
+
+diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
+index 0db2703..b1682d2 100644
+--- a/orte/orted/orted_submit.c
++++ b/orte/orted/orted_submit.c
+@@ -349,6 +349,8 @@ int orte_submit_init(int argc, char *argv[],
+         exit(0);
+     }
+ 
++#ifndef __HAIKU__
++/* User is effective root on Haiku */
+     /* check if we are running as root - if we are, then only allow
+      * us to proceed if the allow-run-as-root flag was given. Otherwise,
+      * exit with a giant warning flag
+@@ -385,6 +387,7 @@ int orte_submit_init(int argc, char *argv[],
+         fprintf(stderr, "--------------------------------------------------------------------------\n");
+         exit(1);
+     }
++#endif
+ 
+   moveon:
+     /* process any mca params */
+-- 
+2.30.0
+