diff --git a/math/mfem/Makefile b/math/mfem/Makefile
index e083093a6c88..25fa7aa7156d 100644
--- a/math/mfem/Makefile
+++ b/math/mfem/Makefile
@@ -1,24 +1,41 @@
 PORTNAME=	mfem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight, general, scalable C++ library for finite element methods
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++11-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
-CMAKE_TESTING_ON=	MFEM_ENABLE_TESTING # tests are broken, see https://github.com/mfem/mfem/issues/2442
+CMAKE_TESTING_ON=	MFEM_ENABLE_TESTING # tests are broken, see https://github.com/mfem/mfem/issues/3163
 
-OPTIONS_DEFINE=	MPI
+OPTIONS_SINGLE=		MPI
+OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
+OPTIONS_DEFAULT=	MPICH # should be the same choice as in science/hypre
 
-MPI_CMAKE_BOOL=	MFEM_USE_MPI
-MPI_BROKEN=	see https://github.com/mfem/mfem/issues/622
+NOMPI_DESC=		Build without parallel processing support
+NOMPI_CMAKE_ON=		-DMFEM_USE_MPI=OFF
+
+MPICH_CMAKE_ON=		-DMFEM_USE_MPI=ON \
+			-DMPI_HOME=${LOCALBASE}
+MPICH_BUILD_DEPENDS=	mpich>0:net/mpich
+MPICH_LIB_DEPENDS=	libHYPRE.so:science/hypre \
+			libmetis.so:math/metis
+OPENMPI_RUN_DEPENDS=	mpich>0:net/mpich
+
+OPENMPI_CMAKE_ON=	-DMFEM_USE_MPI=ON \
+			-DMPI_HOME=${LOCALBASE}/mpi/openmpi
+OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
+OPENMPI_LIB_DEPENDS=	libHYPRE.so:science/hypre \
+			libmetis.so:math/metis
+OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 
 .include <bsd.port.mk>