diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index c90130f016db..eaec43891886 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 
@@ -96,7 +97,7 @@ SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/${MPIDIR}/libdata/pkgconfig|g' \
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.am \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/tools/wrappers/Makefile.am \
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 4bab824f21d6..23598df8f7f6 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,3 +1,10 @@
+libdata/pkgconfig/ompi-c.pc
+libdata/pkgconfig/ompi-cxx.pc
+libdata/pkgconfig/ompi-f77.pc
+libdata/pkgconfig/ompi-f90.pc
+libdata/pkgconfig/ompi-fort.pc
+libdata/pkgconfig/ompi.pc
+libdata/pkgconfig/orte.pc
 %%MPIDIR%%/bin/aggregate_profile.pl
 %%MPIDIR%%/bin/mpiCC
 %%MPIDIR%%/bin/mpic++
@@ -345,13 +352,6 @@
 %%MPIDIR%%/lib/pmix/mca_ptl_tcp.so
 %%MPIDIR%%/lib/pmix/mca_ptl_usock.la
 %%MPIDIR%%/lib/pmix/mca_ptl_usock.so
-%%MPIDIR%%/libdata/pkgconfig/ompi-c.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-cxx.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-f77.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-f90.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi-fort.pc
-%%MPIDIR%%/libdata/pkgconfig/ompi.pc
-%%MPIDIR%%/libdata/pkgconfig/orte.pc
 %%MPIDIR%%/man/man1/mpiCC.1.gz
 %%MPIDIR%%/man/man1/mpic++.1.gz
 %%MPIDIR%%/man/man1/mpicc.1.gz