diff --git a/sysutils/tw_cli/Makefile b/sysutils/tw_cli/Makefile
index 2404f6826142..cc0738f809e1 100644
--- a/sysutils/tw_cli/Makefile
+++ b/sysutils/tw_cli/Makefile
@@ -1,37 +1,43 @@
-# Created by: Dmitry Frolov <frolov@riss-telecom.ru>
 # $FreeBSD$
 
 PORTNAME=	tw_cli
-PORTVERSION=	9.5.4
+PORTVERSION=	9.5.5
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://tsupport:tsupport@ftp0.lsil.com/private/3Ware/downloads/
-DISTNAME=	cli_freebsd_10.2.1_9.5.4
+MASTER_SITES=	http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/
+DISTNAME=	CLI_freebsd-from_the_10-2-2-1_9-5-5-1_codesets
+DIST_SUBDIR=	3dm2
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	3ware storage controllers management CLI
 
+LICENSE=	tw_cli
+LICENSE_NAME=	LSI
+LICENSE_TEXT=	${RESTRICTED}
+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
+
+RESTRICTED=	Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/Pages/user/eula.aspx
+
 USES=		zip
-RESTRICTED=	Redistribution forbidden by license
+
 # i386 binary should work on ia64, but not tested
 ONLY_FOR_ARCHS=	i386 amd64 ia64
-
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
-BINSUFFIX=	${ARCH:S,i386,x86,:S,amd64,x86_64,:S,ia64,x86,}
+NO_WRKSUBDIR=	yes
+
 SUB_FILES=	407.status-3ware-raid
 PORTDOCS=	tw_cli.8.html
 PLIST_FILES=	etc/periodic/daily/407.status-3ware-raid\
 		man/man8/tw_cli.8.gz sbin/tw_cli
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${BINSUFFIX}/tw_cli\
-		${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${ARCH:S,i386,x86,:S,amd64,x86_64,:S,ia64,x86,}/tw_cli\
+		${STAGEDIR}${PREFIX}/sbin/tw_cli
 	${INSTALL_MAN} ${WRKSRC}/tw_cli.8.nroff\
-		${STAGEDIR}${MANPREFIX}/man/man8/tw_cli.8
+		${STAGEDIR}${MAN8PREFIX}/man/man8/tw_cli.8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/407.status-3ware-raid \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tw_cli.8.html ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/tw_cli/distinfo b/sysutils/tw_cli/distinfo
index 0e07cd3a021a..242eb4722606 100644
--- a/sysutils/tw_cli/distinfo
+++ b/sysutils/tw_cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cli_freebsd_10.2.1_9.5.4.zip) = 9305397eb23320cc65186d33ee68a49d01d0e8e46283f12fa7e99664620eda06
-SIZE (cli_freebsd_10.2.1_9.5.4.zip) = 1550003
+SHA256 (3dm2/CLI_freebsd-from_the_10-2-2-1_9-5-5-1_codesets.zip) = 656eb4d1666447ef10b08f9145b93b4f3dab6a27479fe14a4ceea451d7057f97
+SIZE (3dm2/CLI_freebsd-from_the_10-2-2-1_9-5-5-1_codesets.zip) = 1531484