diff --git a/sysutils/storcli2/Makefile b/sysutils/storcli2/Makefile
index fd4818dce310..ba979adf972a 100644
--- a/sysutils/storcli2/Makefile
+++ b/sysutils/storcli2/Makefile
@@ -1,57 +1,57 @@
-PORTNAME=	storcli
-DISTVERSION=	7.3603
+PORTNAME=	storcli2
+DISTVERSION=	8.17
 CATEGORIES=	sysutils
-MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p37/
-DISTNAME=	STORCLI_SAS3.5_P37
-DIST_SUBDIR=	${PORTNAME}${DISTVERSION}
+MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/
+DISTNAME=	StorCLI_Avenger_8.17_08.017.000.0008
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	takefu@airport.fm
-COMMENT=	SAS MegaRAID FreeBSD StorCLI
+COMMENT=	SAS4 MegaRAID FreeBSD StorCLI2
 WWW=		https://www.broadcom.com/support/
 
 LICENSE=	storcli
 LICENSE_NAME=	BROADCOM
 LICENSE_TEXT=	Source recipient must acknowledge license.\
 		Reproduction or redistribution prohibited.\
 		See ${MASTER_SITES}${DISTNAME}${EXTRACT_SUFX}
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	binaries only available for amd64
 USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST_FILES=	sbin/storcli
-PORTDOCS=	MR_SAS_Unified_StorCLI--00${DISTVERSION}.0000.0000.pdf readme.txt
+PLIST_FILES=	sbin/storcli2
+PORTDOCS=	ThirdPartyLicenseNotice.pdf readme.txt
 OPTIONS_DEFINE=	DOCS
-BINSRC=		${WRKSRC}/${DISTNAME}/univ_viva_cli_rel/Unified_storcli_all_os
+BINSRC=		${WRKSRC}/storcli_rel/Avenger_StorCLI
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 DOWNLOAD_URL=	${MASTER_SITES}${DISTNAME}${EXTRACT_SUFX}
 IGNORE=		you must manually fetch the distribution file \
 		(${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, \
 		place it in ${DISTDIR}/${DIST_SUBDIR} and then run make again
 .endif
 
 post-extract:
-	@${TAR} xf ${BINSRC}/FreeBSD/storcli64.tar -C${WRKSRC}
+	@${TAR} xf ${BINSRC}/FreeBSD/storcli2.tar -C${WRKSRC}
 	@${ECHO} "[" > ${WRKDIR}/pkg-message
 	@${ECHO} "{" >> ${WRKDIR}/pkg-message
 	@${ECHO} "  message: <<EOM" >> ${WRKDIR}/pkg-message
 	@${FMT} 75 79 ${BINSRC}/readme.txt >> ${WRKDIR}/pkg-message
 	@${ECHO} "EOM">>  ${WRKDIR}/pkg-message
 	@${ECHO} "}" >> ${WRKDIR}/pkg-message
 	@${ECHO} "]" >> ${WRKDIR}/pkg-message
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/storcli64 ${STAGEDIR}${PREFIX}/sbin/storcli
+	${INSTALL_PROGRAM} ${WRKSRC}/storcli2 ${STAGEDIR}${PREFIX}/sbin/storcli2
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA}	${BINSRC}/../../MR_SAS_Unified_StorCLI--00${DISTVERSION}.0000.0000.pdf \
+	${INSTALL_DATA}	${BINSRC}/ThirdPartyLicenseNotice.pdf \
 		${BINSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/storcli2/distinfo b/sysutils/storcli2/distinfo
index 848e9255e62c..2a445eed3c18 100644
--- a/sysutils/storcli2/distinfo
+++ b/sysutils/storcli2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1772448254
-SHA256 (storcli7.3603/STORCLI_SAS3.5_P37.zip) = aa864c1055eb1488368593f72c0d064177fc53bd5857e4ac126a2b5a1784b754
-SIZE (storcli7.3603/STORCLI_SAS3.5_P37.zip) = 50381817
+TIMESTAMP = 1778771000
+SHA256 (storcli2-8.17/StorCLI_Avenger_8.17_08.017.000.0008.zip) = a85737c902ecd34cf5a78f95287d863077a368fba1548f5c8f2f92544ecf747c
+SIZE (storcli2-8.17/StorCLI_Avenger_8.17_08.017.000.0008.zip) = 44197631