diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile
index 924676e7fd64..908f92fe2b7f 100644
--- a/math/dbcsr/Makefile
+++ b/math/dbcsr/Makefile
@@ -1,56 +1,59 @@
 PORTNAME=	dbcsr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Block Compressed Sparse Row matrix library
 WWW=		https://www.cp2k.org/dbcsr
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 
 USES=		blaslapack:openblas cmake:noninja,testing compiler:c++14-lang fortran \
 		python:build
+USE_GCC=	yes # OpenMP is used from both Forran and C code, therefore C code should be compiled with GCC, otherwise it fails at run-time (same in cp2k)
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cp2k
 
 FFLAGS+=	-D__NO_STATM_ACCESS # disable /proc/self/statm access
 LDFLAGS+=	-lopenblas
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING WITH_EXAMPLES
 CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS" -DPython_EXECUTABLE=${PYTHON_CMD}
 
 BINARY_ALIAS=	git=false # with git sonames get messed up
 
-OPTIONS_DEFINE=		MPIX OPENMP C_API # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73
-OPTIONS_DEFAULT=	MPIX OPENMP C_API
+OPTIONS_DEFINE=		C_API MPIX OPENMP # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73
+OPTIONS_DEFAULT=	C_API MPIX OPENMP
 OPTIONS_SUB=		yes
 
 MPIX_DESC=		Use OpenMPI
-MPIX_CMAKE_BOOL=	USE_MPI
+MPIX_CMAKE_BOOL=	USE_MPI USE_MPI_F08
 MPIX_USES=		mpi:mpich
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
 
 C_API_DESC=		Build the C API library
 C_API_CMAKE_BOOL=	WITH_C_API
+C_API_IMPLIES=		MPIX # the ISO_C_BINDINGS require MPI unconditionally
 
 .include <bsd.port.pre.mk>
 
 .  if ${GCC_DEFAULT} >= 10
 CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS} -fallow-argument-mismatch" # -fallow-argument-mismatch is a workaround of https://github.com/cp2k/dbcsr/issues/387 for gcc10+
 .  else
 CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS}"
 .  endif
 
 .include <bsd.port.post.mk>
diff --git a/math/dbcsr/pkg-plist b/math/dbcsr/pkg-plist
index cbb5dc0c1985..15152268d65a 100644
--- a/math/dbcsr/pkg-plist
+++ b/math/dbcsr/pkg-plist
@@ -1,14 +1,14 @@
 %%C_API%%include/dbcsr.h
 include/dbcsr_api.mod
-include/dbcsr_tensor.h
+%%C_API%%include/dbcsr_tensor.h
 include/dbcsr_tensor_api.mod
 lib/cmake/dbcsr/DBCSRConfig.cmake
 lib/cmake/dbcsr/DBCSRConfigVersion.cmake
 lib/cmake/dbcsr/DBCSRTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/dbcsr/DBCSRTargets.cmake
 lib/libdbcsr.so
 lib/libdbcsr.so.2.7
 lib/libdbcsr.so.2.7.0
-lib/libdbcsr_c.so
-lib/libdbcsr_c.so.2.7
-lib/libdbcsr_c.so.2.7.0
+%%C_API%%lib/libdbcsr_c.so
+%%C_API%%lib/libdbcsr_c.so.2.7
+%%C_API%%lib/libdbcsr_c.so.2.7.0