Index: head/www/gitlab-workhorse/Makefile
===================================================================
--- head/www/gitlab-workhorse/Makefile	(revision 466440)
+++ head/www/gitlab-workhorse/Makefile	(revision 466441)
@@ -1,35 +1,34 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	3.3.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	3.6.0
 CATEGORIES=	www
-MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
 MAINTAINER=	idefix@fechner.net
 COMMENT=	Smart reverse proxy for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go>=1.5.3:lang/go
 
 MAKE_JOBS_UNSAFE=yes
 USES=	gmake
+USE_GITLAB=	yes
+GL_ACCOUNT=	gitlab-org
+# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags
+GL_COMMIT=	51fe78e3acd65292b15402db17179e362e88a65e
 
 PLIST_FILES=	bin/gitlab-workhorse \
 		bin/gitlab-zip-cat \
 		bin/gitlab-zip-metadata
-PLIST_DIRS=	%%WWWDIR%%
-
-post-extract:
-	@${MV} ${WRKDIR}/${DISTNAME}-* ${WRKDIR}/${DISTNAME}
+PLIST_DIRS=	${WWWDIR}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gitlab-workhorse
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gitlab-zip-cat
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gitlab-zip-metadata
 
 .include <bsd.port.mk>
Index: head/www/gitlab-workhorse/distinfo
===================================================================
--- head/www/gitlab-workhorse/distinfo	(revision 466440)
+++ head/www/gitlab-workhorse/distinfo	(revision 466441)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516803285
-SHA256 (gitlab-workhorse-v3.3.1.tar.gz) = de8165d271b5c87f0cc4d879d5422fd443f0d32c0224e9c6e5801c2758fe78cf
-SIZE (gitlab-workhorse-v3.3.1.tar.gz) = 911861
+TIMESTAMP = 1522771766
+SHA256 (gitlab-org-gitlab-workhorse-51fe78e3acd65292b15402db17179e362e88a65e_GL0.tar.gz) = bfe9c2441cefa29350a411f48263a4d3e9bc16ddf9c7bbdc2ee0734701306760
+SIZE (gitlab-org-gitlab-workhorse-51fe78e3acd65292b15402db17179e362e88a65e_GL0.tar.gz) = 944116