diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index b4a0a61acc8f..392d995029eb 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -1,47 +1,51 @@
 PORTNAME=	deco
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	archivers
+PKGNAMESUFFIX=	-extractor # avoid collision with misc/deco
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to extract various archive file formats
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	peha
 GH_PROJECT=	deco-archive:archive
-GH_TAGNAME=	1.7:archive
+GH_TAGNAME=	${DARCHIVE_VER}:archive
 
 RUN_DEPENDS=	arc:archivers/arc \
 		arj:archivers/arj \
 		cabextract:archivers/cabextract \
 		dpkg:archivers/dpkg \
 		lzop:archivers/lzop \
-		7z:archivers/p7zip \
+		7zz:archivers/7-zip \
 		rpm:archivers/rpm4 \
 		rzip:archivers/rzip \
 		unace:archivers/unace \
 		unrar:archivers/unrar \
 		zoo:archivers/zoo \
 		flac:audio/flac
 
-CONFLICTS=	deco
+DARCHIVE_VER=	1.7
+DARCHIVE=	deco-archive-${DARCHIVE_VER}
 
 post-patch:
-	@${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.7/x/"tar\.xz"
+	@${CP} ${FILESDIR}/extract ${WRKDIR}/${DARCHIVE}/x/"tar\.xz"
+	${REINPLACE_CMD} 's/7za/7zz/;s,-l ,,' ${WRKDIR}/${DARCHIVE}/x/7z/extract
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin/deco-extract
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in LICENSE Makefile NEWS README config.mk
-	${RM} -r ${WRKSRC}/../${PORTNAME}-archive-1.7/${i}
+	${RM} -r ${WRKSRC}/../${DARCHIVE}/${i}
 .endfor
-	@cd ${WRKDIR}/${PORTNAME}-archive-1.7/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@cd ${WRKDIR}/${DARCHIVE}/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR} -type f -exec ${CHMOD} +x {} \;
 
 .include <bsd.port.mk>
diff --git a/archivers/deco/pkg-plist b/archivers/deco/pkg-plist
index 150824d07830..3a4707500325 100644
--- a/archivers/deco/pkg-plist
+++ b/archivers/deco/pkg-plist
@@ -1,91 +1,91 @@
-bin/deco
+bin/deco-extract
 %%DATADIR%%/7z/extract
 %%DATADIR%%/7z\.[0-9]{2,}
 %%DATADIR%%/a/extract
 %%DATADIR%%/ace|[c0-9][0-9]{2}/extract
 %%DATADIR%%/ace|[c0-9][0-9]{2}/permissions
 %%DATADIR%%/alz/extract
 %%DATADIR%%/ape/extract
 %%DATADIR%%/apk
 %%DATADIR%%/ar
 %%DATADIR%%/arc/extract
 %%DATADIR%%/arj/extract
 %%DATADIR%%/ark
 %%DATADIR%%/bz2/extract
 %%DATADIR%%/cab/extract
 %%DATADIR%%/cbr
 %%DATADIR%%/cbz
 %%DATADIR%%/cpio/extract
 %%DATADIR%%/cpio\.bz2/extract
 %%DATADIR%%/cpio\.gz/extract
 %%DATADIR%%/cpio\.lz/extract
 %%DATADIR%%/cpio\.lzo/extract
 %%DATADIR%%/cpio\.xz/extract
 %%DATADIR%%/deb/extract
 %%DATADIR%%/deb/subdirectory
 %%DATADIR%%/ear
 %%DATADIR%%/flac/extract
 %%DATADIR%%/gem/extract
 %%DATADIR%%/gem/subdirectory
 %%DATADIR%%/gz/extract
 %%DATADIR%%/ipsw
 %%DATADIR%%/jar
 %%DATADIR%%/lha/extract
 %%DATADIR%%/lrz/extract
 %%DATADIR%%/lz/extract
 %%DATADIR%%/lzh
 %%DATADIR%%/lzma/extract
 %%DATADIR%%/lzo/extract
 %%DATADIR%%/odc
 %%DATADIR%%/odf
 %%DATADIR%%/odg
 %%DATADIR%%/odi
 %%DATADIR%%/odm
 %%DATADIR%%/odp
 %%DATADIR%%/ods
 %%DATADIR%%/odt
 %%DATADIR%%/otc
 %%DATADIR%%/otf
 %%DATADIR%%/otg
 %%DATADIR%%/oth
 %%DATADIR%%/oti
 %%DATADIR%%/otp
 %%DATADIR%%/ots
 %%DATADIR%%/ott
 %%DATADIR%%/oxt
 %%DATADIR%%/part[0-9]+\.rar
 %%DATADIR%%/pk3
 %%DATADIR%%/pk4
 %%DATADIR%%/rar|[rst][0-9]{2}/extract
 %%DATADIR%%/rar|[rst][0-9]{2}/permissions
 %%DATADIR%%/rpm/extract
 %%DATADIR%%/rpm/subdirectory
 %%DATADIR%%/rz/extract
 %%DATADIR%%/shn/extract
 %%DATADIR%%/sue
 %%DATADIR%%/t7z
 %%DATADIR%%/t7z\.[0-9]{2,}
 %%DATADIR%%/tar/extract
 %%DATADIR%%/tar\.7z/extract
 %%DATADIR%%/tar\.7z\.[0-9]{2,}
 %%DATADIR%%/tar\.bz2/extract
 %%DATADIR%%/tar\.gz/extract
 %%DATADIR%%/tar\.lrz/extract
 %%DATADIR%%/tar\.lz/extract
 %%DATADIR%%/tar\.lzma/extract
 %%DATADIR%%/tar\.rz/extract
 %%DATADIR%%/tar\.xz/extract
 %%DATADIR%%/tar\.z
 %%DATADIR%%/taz
 %%DATADIR%%/tbz
 %%DATADIR%%/tbz2
 %%DATADIR%%/tgz
 %%DATADIR%%/tlz/extract
 %%DATADIR%%/txz
 %%DATADIR%%/udeb
 %%DATADIR%%/wsz
 %%DATADIR%%/xpi
 %%DATADIR%%/xz/extract
 %%DATADIR%%/z
 %%DATADIR%%/zip/extract
 %%DATADIR%%/zoo/extract