diff --git a/math/costa/Makefile b/math/costa/Makefile
index 7aa3e329ecb2..12f41b4d51ef 100644
--- a/math/costa/Makefile
+++ b/math/costa/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	costa
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1
+DISTVERSION=	2.2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Communication-Optimal Shuffle and Transpose Algorithm
 WWW=		https://github.com/eth-cscs/COSTA
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libscalapack.so:math/scalapack
 
 USES=		cmake:testing pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 GH_PROJECT=	COSTA
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DCOSTA_SCALAPACK=CUSTOM
 CMAKE_OFF=	COSTA_WITH_TESTS
 CMAKE_TESTING_ON=	COSTA_WITH_TESTS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 post-install: # workaround for https://github.com/eth-cscs/COSTA/issues/9
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} \
 		include/costa/pxtran \
 		include/costa/pxtranc \
 		include/costa/pxtranu
 
 .include <bsd.port.mk>
diff --git a/math/costa/distinfo b/math/costa/distinfo
index 1f6c58c82e01..a71b5356c9ca 100644
--- a/math/costa/distinfo
+++ b/math/costa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661524865
-SHA256 (eth-cscs-COSTA-v2.1_GH0.tar.gz) = c1e86452415083f7470b292d93ec60708b7c8dbafc2bac383636bb4b28135866
-SIZE (eth-cscs-COSTA-v2.1_GH0.tar.gz) = 804671
+TIMESTAMP = 1677128868
+SHA256 (eth-cscs-COSTA-v2.2_GH0.tar.gz) = 3e7333f012af76ec3508276ea90800313f6136504667021fe229e710bf6acdc7
+SIZE (eth-cscs-COSTA-v2.2_GH0.tar.gz) = 709317
diff --git a/math/costa/pkg-plist b/math/costa/pkg-plist
index 04d919bd461b..81c8b57af517 100644
--- a/math/costa/pkg-plist
+++ b/math/costa/pkg-plist
@@ -1,35 +1,37 @@
 include/costa/blacs.hpp
 include/costa/cinterface/transform.hpp
 include/costa/grid2grid/block.hpp
 include/costa/grid2grid/cantor_mapping.hpp
 include/costa/grid2grid/comm_volume.hpp
 include/costa/grid2grid/communication_data.hpp
 include/costa/grid2grid/grid2D.hpp
 include/costa/grid2grid/grid_cover.hpp
 include/costa/grid2grid/grid_layout.hpp
 include/costa/grid2grid/interval.hpp
 include/costa/grid2grid/memory_utils.hpp
 include/costa/grid2grid/mpi_type_wrapper.hpp
 include/costa/grid2grid/profiler.hpp
 include/costa/grid2grid/ranks_reordering.hpp
 include/costa/grid2grid/scalapack_layout.hpp
-include/costa/grid2grid/threads_workspace.hpp
 include/costa/grid2grid/transform.hpp
 include/costa/grid2grid/transformer.hpp
 include/costa/grid2grid/utils.hpp
+include/costa/grid2grid/workspace.hpp
 include/costa/layout.hpp
 include/costa/pxgemr2d/costa_pxgemr2d.hpp
 include/costa/pxgemr2d/pxgemr2d_params.hpp
 include/costa/pxtran_op/costa_pxtran_op.hpp
 include/costa/pxtran_op/pxtran_op_params.hpp
 include/costa/random_generator.hpp
 include/costa/scalapack.hpp
+lib/cmake/costa/FindCRAY_LIBSCI.cmake
 lib/cmake/costa/FindMKL.cmake
+lib/cmake/costa/FindSCALAPACK.cmake
 lib/cmake/costa/costaConfig.cmake
 lib/cmake/costa/costaConfigVersion.cmake
 lib/cmake/costa/costaTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/costa/costaTargets.cmake
 lib/libcosta.so
 lib/libcosta_prefixed_scalapack.so
 lib/libcosta_scalapack.so
 libdata/pkgconfig/costa.pc