diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index b53e5f1..e3e1bb7 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -24,7 +24,9 @@ pbuild::pre_configure() {
 	pbuild::add_configure_args "--enable-static"
 	pbuild::add_configure_args "--with-sge=yes"
 	pbuild::add_configure_args "--with-slurm=yes"
-	if (( V_MAJOR < 4 )); then
+	local version
+	(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
+	if (( version < 30104 )) ; then
 		pbuild::add_configure_args "--enable-mpi-f90"
 		pbuild::add_configure_args "--enable-mpi-profile"
 		pbuild::add_configure_args "--enable-smp-locks"
@@ -34,13 +36,10 @@ pbuild::pre_configure() {
 }
 
 pbuild::post_install() {
-	if [[ -r /usr/lib64/libnuma.so ]]; then
-		cp -av /usr/lib64/libnuma.so.* "${PREFIX}/lib/fallback"
-	fi
-	if [[ -r /usr/lib64/libibverbs.so ]]; then
-		cp -av /usr/lib64/libibverbs.so.* "${PREFIX}/lib/fallback"
-	fi
-	if [[ -r /usr/lib64/librdmacm.so ]]; then
-		cp -av /usr/lib64/librdmacm.so.* "${PREFIX}/lib/fallback"
-	fi
+	mkdir -p "${PREFIX}/lib/fallback"
+	local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libuc[mpst].so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libnuma.so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libbverbs.so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/librdmacm.so'
 }