diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index 9ffccc23ccd4..f39477639b3c 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -1,18 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	deco
-PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTVERSION=	1.6.4
 CATEGORIES=	archivers
-MASTER_SITES=	http://hartlich.com/deco/download/ \
-		http://hartlich.com/deco/archive/download/:site2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}-archive-1.6${EXTRACT_SUFX}:site2
 
 MAINTAINER=	kevlo@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.6.4 1.7:archive
 
 RUN_DEPENDS=	arc:archivers/arc \
 		arj:archivers/arj \
@@ -30,21 +31,19 @@ RUN_DEPENDS=	arc:archivers/arc \
 CONFLICTS=	deco-[0-9]*
 
 post-patch:
-	@${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.6/x/"tar\.xz"
+	@${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.7/x/"tar\.xz"
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-	cd ${WRKDIR}/${PORTNAME}-archive-1.6 && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-.for i in CREDITS LICENSE Makefile NEWS README config.mk
-	${RM} -rf ${WRKSRC}/../${PORTNAME}-archive-1.6/${i}
+.for i in LICENSE Makefile NEWS README config.mk
+	${RM} -rf ${WRKSRC}/../${PORTNAME}-archive-1.7/${i}
 .endfor
-	@cd ${WRKDIR}/${PORTNAME}-archive-1.6/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@cd ${WRKDIR}/${PORTNAME}-archive-1.7/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR} -type f -exec ${CHMOD} +x {} \;
 
 .include <bsd.port.mk>
diff --git a/archivers/deco/distinfo b/archivers/deco/distinfo
index 6ef720c0dafe..7b441d028092 100644
--- a/archivers/deco/distinfo
+++ b/archivers/deco/distinfo
@@ -1,4 +1,5 @@
-SHA256 (deco-1.6.3.tar.gz) = 18caa51d3a967076a93d4f287f70071cc40c06eb68cc7f663e9ce3269ddad6f5
-SIZE (deco-1.6.3.tar.gz) = 11540
-SHA256 (deco-archive-1.6.tar.gz) = 128253a1b232ac10993d7a20b6cb31dfc1f4ad9d9015b0483a33fb6ea558844d
-SIZE (deco-archive-1.6.tar.gz) = 4682
+TIMESTAMP = 1468823216
+SHA256 (peha-deco-1.6.4_GH0.tar.gz) = 6139b3efbe9df995ea0bb4506ba2edc00398d0dff6ba2728a1148366208cfdb7
+SIZE (peha-deco-1.6.4_GH0.tar.gz) = 23150
+SHA256 (peha-deco-archive-1.7_GH0.tar.gz) = 280a9cf4df8f0a5fe5eb390870c791d3d2cf831b1397a3e4734366f112514ce1
+SIZE (peha-deco-archive-1.7_GH0.tar.gz) = 17617
diff --git a/archivers/deco/pkg-descr b/archivers/deco/pkg-descr
index 754661f53939..8cb38502d9b3 100644
--- a/archivers/deco/pkg-descr
+++ b/archivers/deco/pkg-descr
@@ -2,4 +2,4 @@ Deco is a Un*x script able to extract various archive file formats.
 Supported archive formats: 7z, ace, ar, arc, arj, bz2, cab, cpio, deb,
 flac, gz, jar, lha, lzma, lzo, rar, rpm, tar, zip, zoo.
 
-WWW: http://hartlich.com/deco/
+WWW: https://github.com/peha/deco
diff --git a/archivers/deco/pkg-plist b/archivers/deco/pkg-plist
index 474340f5637d..150824d07830 100644
--- a/archivers/deco/pkg-plist
+++ b/archivers/deco/pkg-plist
@@ -6,6 +6,7 @@ bin/deco
 %%DATADIR%%/ace|[c0-9][0-9]{2}/permissions
 %%DATADIR%%/alz/extract
 %%DATADIR%%/ape/extract
+%%DATADIR%%/apk
 %%DATADIR%%/ar
 %%DATADIR%%/arc/extract
 %%DATADIR%%/arj/extract