diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index fb099b78a81c..81afa4e4877d 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -1,60 +1,62 @@
 PORTNAME=	IMB
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2021.7
-PORTREVISION=	2
+DISTVERSIONPREFIX=	IMB-v
+DISTVERSION=	2021.11
 CATEGORIES=	benchmarks parallel
-MASTER_SITES=	https://github.com/intel/mpi-benchmarks/archive/refs/tags/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Intel MPI Benchmark
+MAINTAINER=	laurent@FreeBSD.org
+COMMENT=	Intel(R) MPI Benchmark
 WWW=		https://software.intel.com/en-us/imb-user-guide
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license/license.txt
 
-#USE_GITHUB=	yes
-#GH_ACCOUNT=	intel
-#GH_PROJECT=	mpi-benchmarks
+FLAVORS=		mpich openmpi
+FLAVOR?=		${FLAVORS:[1]}
+openmpi_PKGNAMESUFFIX=	-openmpi
 
-USES=		gmake localbase
+USES=		gmake localbase mpi:${FLAVOR}
 USE_CXXSTD=	c++14
 
-BINARY_ALIAS=	make=${GMAKE}
+USE_GITHUB=	yes
+GH_ACCOUNT=	intel
+GH_PROJECT=	mpi-benchmarks
 
-WRKSRC=		${WRKDIR}/mpi-benchmarks-${DISTNAME}
+MAKE_ENV=	MPI_HOME=${MPI_HOME}
 
 # Intel hardcodes -O3 in make_mpich.  Replacing it with system defaults
 # would make it impossible to compare benchmark results with other systems.
 # By putting it here we make it easier for somebody to change it, if they
 # _really_ want it.
 OPT_CFLAGS=	-O3
+CFLAGS+=	${OPT_CFLAGS} ${MPI_CFLAGS}
+CXXFLAGS+=	-fopenmp
+LDFLAGS+=	-Wl,-rpath,/lib ${MPI_LIBS} -fopenmp
+
 CC=		${MPICC}
 CXX=		${MPICXX}
-CFLAGS+=	${OPT_CFLAGS} ${MPI_CFLAGS}
-LDFLAGS+=	${MPI_LIBS}
-MAKE_ENV=	MPI_HOME=${MPI_HOME}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${FLAVOR}
+BINARY_ALIAS=	make=${GMAKE}
 
-OPTIONS_DEFINE=		CHECK_RESULTS DOCS
-OPTIONS_RADIO=		MPI
-OPTIONS_RADIO_MPI=	MPICH OPENMPI
-OPTIONS_DEFAULT=	MPICH
+PLIST_SUB=	FLAVOR=${FLAVOR}
+
+OPTIONS_DEFINE=	CHECK_RESULTS DOCS
 
 # Attention: -DCHECK results are not valid as real benchmark data! Don't
 # forget to deactivate DCHECK and recompile in order to get proper results.
 CHECK_RESULTS_DESC=	Check results (not valid as real benchmark data)
 CHECK_RESULTS_CFLAGS=	-DCHECK
 
-MPICH_USES=	mpi:mpich
-OPENMPI_USES=	mpi:openmpi
-
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-* ${STAGEDIR}${PREFIX}/bin)
+	@for benchmark in ${WRKSRC}/IMB-*; do \
+		${INSTALL_PROGRAM} $${benchmark} \
+			${STAGEDIR}${PREFIX}/bin/$${benchmark##*/}-${FLAVOR}; \
+	done
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ReadMe_IMB.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license/third-party-programs.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license/use-of-trademark-license.txt \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/imb/distinfo b/benchmarks/imb/distinfo
index d5d6e46ae5f3..77f57e2a37ca 100644
--- a/benchmarks/imb/distinfo
+++ b/benchmarks/imb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700058866
-SHA256 (IMB-v2021.7.tar.gz) = acee02cc719a74e6853194576cb7e6bf1fdc74f8971578e1b2141306c3c19477
-SIZE (IMB-v2021.7.tar.gz) = 213009
+TIMESTAMP = 1781519639
+SHA256 (intel-mpi-benchmarks-IMB-v2021.11_GH0.tar.gz) = 728b522b3bb05580c26e374bfae2a262bf8007b3b2c7d4c9480e4363953270c7
+SIZE (intel-mpi-benchmarks-IMB-v2021.11_GH0.tar.gz) = 222276
diff --git a/benchmarks/imb/files/patch-src__c_P2P_Makefile b/benchmarks/imb/files/patch-src__c_P2P_Makefile
index f8884706e99e..b25a3c055ab8 100644
--- a/benchmarks/imb/files/patch-src__c_P2P_Makefile
+++ b/benchmarks/imb/files/patch-src__c_P2P_Makefile
@@ -1,11 +1,11 @@
---- src_c/P2P/Makefile.orig	2021-10-01 13:09:19 UTC
+--- src_c/P2P/Makefile.orig	2026-03-29 11:38:03 UTC
 +++ src_c/P2P/Makefile
-@@ -50,7 +50,7 @@ BINARY:=IMB-P2P
+@@ -33,7 +33,7 @@ BINARY:=IMB-P2P
  TARGET=P2P
  BINARY:=IMB-P2P
  
--override CFLAGS += -O3 -Wall -Wextra -pedantic -Wno-long-long
-+override CFLAGS += -Wall -Wextra -pedantic -Wno-long-long
+-override CFLAGS += -O3 -Wall -Wextra -Werror
++override CFLAGS += -Wall -Wextra -Werror
  override LDFLAGS += -lm
  
  ifeq ($(origin CC),default)
diff --git a/benchmarks/imb/pkg-plist b/benchmarks/imb/pkg-plist
index 36506631b8d1..b86ee45bba0b 100644
--- a/benchmarks/imb/pkg-plist
+++ b/benchmarks/imb/pkg-plist
@@ -1,10 +1,10 @@
-bin/IMB-EXT
-bin/IMB-IO
-bin/IMB-MPI1
-bin/IMB-MT
-bin/IMB-NBC
-bin/IMB-P2P
-bin/IMB-RMA
+bin/IMB-EXT-%%FLAVOR%%
+bin/IMB-IO-%%FLAVOR%%
+bin/IMB-MPI1-%%FLAVOR%%
+bin/IMB-MT-%%FLAVOR%%
+bin/IMB-NBC-%%FLAVOR%%
+bin/IMB-P2P-%%FLAVOR%%
+bin/IMB-RMA-%%FLAVOR%%
 %%PORTDOCS%%%%DOCSDIR%%/ReadMe_IMB.txt
 %%PORTDOCS%%%%DOCSDIR%%/third-party-programs.txt
 %%PORTDOCS%%%%DOCSDIR%%/use-of-trademark-license.txt