diff --git a/sysutils/storcli/Makefile b/sysutils/storcli/Makefile
index 7b38affd1c7e..ee5d409c9b93 100644
--- a/sysutils/storcli/Makefile
+++ b/sysutils/storcli/Makefile
@@ -1,48 +1,54 @@
 PORTNAME=	storcli
-DISTVERSION=	7.2309
+DISTVERSION=	7.3006
 CATEGORIES=	sysutils
-MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/
-DISTNAME=	Unified_storcli_all_os_7.2309.0000.0000
+MASTER_SITES=	https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p31/
+DISTNAME=	STORCLI_SAS3.5_P31
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	SAS MegaRAID FreeBSD StorCLI
 WWW=		https://www.broadcom.com/support/
 
 LICENSE=	storcli
 LICENSE_NAME=	BROADCOM
 LICENSE_TEXT=	Source recipient must acknowledge license.\
 		Reproduction or redistribution prohibited.\
-		See https://www.broadcom.com/company/legal/licensing
+		See https://docs.broadcom.com/docs/${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
-BINSRC=		${WRKSRC}/Unified_storcli_all_os
+PORTDOCS=	MR_SAS_Unified_StorCLI--00${DISTVERSION}.0000.0000.pdf readme.txt
+OPTIONS_DEFINE=	DOCS
+BINSRC=		${WRKSRC}/${DISTNAME}/univ_viva_cli_rel/Unified_storcli_all_os
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-DOWNLOAD_URL=	https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${DISTNAME}${EXTRACT_SUFX}
-IGNORE?=	You must manually fetch the distribution file\
-	(${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL},\
-	place it in ${DISTDIR} and then run make again
+DOWNLOAD_URL=	https://docs.broadcom.com/docs/${DISTNAME}${EXTRACT_SUFX}
+IGNORE=		you must manually fetch the distribution file \
+		(${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, \
+		place it in ${DISTDIR} and then run make again
 .endif
 
 post-extract:
 	@${TAR} xf ${BINSRC}/FreeBSD/storcli64.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_SCRIPT} ${WRKSRC}/storcli64 ${STAGEDIR}${PREFIX}/sbin/storcli
+	${INSTALL_PROGRAM} ${WRKSRC}/storcli64 ${STAGEDIR}${PREFIX}/sbin/storcli
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}	${BINSRC}/../../MR_SAS_Unified_StorCLI--00${DISTVERSION}.0000.0000.pdf \
+		${BINSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/storcli/distinfo b/sysutils/storcli/distinfo
index 9e22a3e985c3..17a072c0152d 100644
--- a/sysutils/storcli/distinfo
+++ b/sysutils/storcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670195640
-SHA256 (Unified_storcli_all_os_7.2309.0000.0000.zip) = 6fdf3e76b23cddd75730ea68e879d30dfef98ebf372552290301068cb7ac995a
-SIZE (Unified_storcli_all_os_7.2309.0000.0000.zip) = 32064815
+TIMESTAMP = 1721693528
+SHA256 (STORCLI_SAS3.5_P31.zip) = 49dcd9e7a3c85327b0fa08772a0965bd5c03552c045d9dbfd96c8381749ee943
+SIZE (STORCLI_SAS3.5_P31.zip) = 37385652