diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index b74295970e5e..a740fd533fc5 100644
--- a/science/hypre/Makefile
+++ b/science/hypre/Makefile
@@ -1,53 +1,60 @@
 PORTNAME=	hypre
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.31.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scalable Linear Solvers and Multigrid Methods
 WWW=		https://computing.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/../LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/../LICENSE-MIT
 
-USES=		blaslapack cmake:testing fortran localbase
+LIB_DEPENDS=	libsuperlu.so:math/superlu
+
+USES=		blaslapack:openblas cmake:testing fortran localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hypre-space
 
 WRKSRC_SUBDIR=	src
 
-CMAKE_ON=	HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP
+CMAKE_ON=	HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP HYPRE_WITH_SUPERLU
+CMAKE_OFF=	HYPRE_ENABLE_HYPRE_BLAS HYPRE_ENABLE_HYPRE_LAPACK
+CMAKE_ARGS=	-DTPL_BLAS_LIBRARIES="${_BLASLIB}"	\
+		-DTPL_SUPERLU_LIBRARIES="${LOCALBASE}/lib/libsuperlu.so"	\
+		-DTPL_SUPERLU_INCLUDE_DIRS="${LOCALBASE}/include/superlu"
 CMAKE_TESTING_ON=	HYPRE_BUILD_TESTS # tests are only built and not run, see https://github.com/hypre-space/hypre/issues/502
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CMAKE_ON=		-DHYPRE_WITH_MPI=OFF
 
 MPICH_USES=		mpi:mpich
 MPICH_CMAKE_ON=		-DHYPRE_WITH_MPI=ON
 
 OPENMPI_USES=		mpi:openmpi
 OPENMPI_CMAKE_ON=	-DHYPRE_WITH_MPI=ON
 OPENMPI_BROKEN=		doesn't switch to openmpi in cmake build, see https://github.com/hypre-space/hypre/issues/720
 
 PORTDOCS=	*
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so	\
 		${STAGEDIR}${PREFIX}/lib/libHYPRE.so.0
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.0	\
 		${STAGEDIR}${PREFIX}/lib/libHYPRE.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} usr-manual ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/hypre/pkg-plist b/science/hypre/pkg-plist
index 232b6f092f39..d505f57cbf50 100644
--- a/science/hypre/pkg-plist
+++ b/science/hypre/pkg-plist
@@ -1,62 +1,58 @@
 include/HYPRE.h
 include/HYPRE_DistributedMatrixPilutSolver_protos.h
 include/HYPRE_DistributedMatrixPilutSolver_types.h
 include/HYPRE_IJ_mv.h
 include/HYPRE_MatvecFunctions.h
 include/HYPRE_config.h
 include/HYPRE_distributed_matrix_mv.h
 include/HYPRE_distributed_matrix_protos.h
 include/HYPRE_distributed_matrix_types.h
 include/HYPRE_error_f.h
 include/HYPRE_krylov.h
 include/HYPRE_lobpcg.h
 include/HYPRE_matrix_matrix_protos.h
 include/HYPRE_parcsr_ls.h
 include/HYPRE_parcsr_mv.h
 include/HYPRE_seq_mv.h
 include/HYPRE_sstruct_ls.h
 include/HYPRE_sstruct_mv.h
 include/HYPRE_struct_ls.h
 include/HYPRE_struct_mv.h
 include/HYPRE_utilities.h
 include/HYPREf.h
 include/IJ_matrix.h
 include/IJ_vector.h
 include/_hypre_IJ_mv.h
-include/_hypre_blas.h
-include/_hypre_lapack.h
 include/_hypre_parcsr_ls.h
 include/_hypre_parcsr_mv.h
 include/_hypre_seq_block_mv.h
 include/_hypre_sstruct_ls.h
 include/_hypre_sstruct_mv.h
 include/_hypre_struct_ls.h
 include/_hypre_struct_mv.h
 include/_hypre_utilities.h
 include/_hypre_utilities.hpp
 include/aux_par_vector.h
 include/aux_parcsr_matrix.h
 include/csr_block_matrix.h
 include/csr_matmultivec.h
 include/distributed_matrix.h
-include/f2c.h
 include/fortran.h
 include/fortran_matrix.h
-include/hypre_blas.h
 include/interpreter.h
 include/krylov.h
 include/lobpcg.h
 include/multivector.h
 include/par_csr_block_matrix.h
 include/par_csr_matmultivec.h
 include/par_csr_pmvcomm.h
 include/par_multivector.h
 include/seq_multivector.h
 include/seq_mv.h
 include/temp_multivector.h
 lib/cmake/HYPRE/HYPREConfig.cmake
 lib/cmake/HYPRE/HYPREConfigVersion.cmake
 lib/cmake/HYPRE/HYPRETargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/HYPRE/HYPRETargets.cmake
 lib/libHYPRE.so
 lib/libHYPRE.so.0