diff --git a/common/shlibs b/common/shlibs
index 7e23c87e0c7..7420ce8bab6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -646,21 +646,12 @@ libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
-libmca_common_sm.so.4 libopenmpi-1.8.2_1
-libmpi.so.12 libopenmpi-1.10.0_1
-libmpi_cxx.so.1 libopenmpi-1.8.2_1
-libompitrace.so.0 libopenmpi-1.8.2_1
-libopen-pal.so.13 libopenmpi-1.10.0_1
-libopen-rte.so.12 libopenmpi-1.10.0_1
-libopen-trace-format.so.1 libopenmpi-1.8.2_1
-libopenmpi_malloc.so.0 libopenmpi-1.4.1_6
-liboshmem.so.8 libopenmpi-1.10.0_1
-libotfaux.so.0 libopenmpi-1.8.2_1
-libvt-hyb.so.0 libopenmpi-1.8.2_1
-libvt-mpi-unify.so.0 libopenmpi-1.8.2_1
-libvt-mpi.so.0 libopenmpi-1.8.2_1
-libvt-mt.so.0 libopenmpi-1.8.2_1
-libvt.so.0 libopenmpi-1.8.2_1
+libmca_common_sm.so.20 libopenmpi-2.0.1_1
+libmpi.so.20 libopenmpi-2.0.1_1
+libompitrace.so.20 libopenmpi-2.0.1_1
+libopen-pal.so.20 libopenmpi-2.0.1_1
+libopen-rte.so.20 libopenmpi-2.0.1_1
+liboshmem.so.20 libopenmpi-2.0.1_1
 libmtp.so.9 libmtp-1.1.4_1
 libelf.so.1 libelf-0.155_1
 libdw.so.1 libelf-0.155_1
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 72e8af24587..e01b0a8ccf9 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,14 +1,10 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=1.10.3
+version=2.0.1
 revision=1
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr"
-case "$XBPS_TARGET_MACHINE" in
-	# Disable VampirTrace wrappers on musl, different prototypes.
-	*-musl) configure_args+=" --enable-contrib-no-build=vt";;
-esac
 hostmakedepends="perl libgomp-devel"
 makedepends="zlib-devel libgomp-devel libhwloc-devel"
 conf_files="
@@ -19,8 +15,8 @@ short_desc="A High Performance Message Passing Library"
 homepage="http://www.open-mpi.org/"
 license="3-clause-BSD"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://www.open-mpi.org/software/ompi/v1.10/downloads/${pkgname}-${version}.tar.bz2"
-checksum=7484bb664312082fd12edc2445b42362089b53b17fb5fce12efd4fe452cc254d
+distfiles="http://www.open-mpi.org/software/ompi/v2.0/downloads/${pkgname}-${version}.tar.bz2"
+checksum=fed74f4ae619b7ebcc18150bb5bdb65e273e14a8c094e78a3fea0df59b9ff8ff
 nocross=yes  # libtool -rpath /usr/lib issue
 
 post_install() {
@@ -54,10 +50,6 @@ openmpi-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl) ;;
-			*) vmove "usr/lib/*.a";;
-		esac
 		vmove "usr/lib/*.so"
 		vmove usr/share/man/man3
 	}