diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile
index aee5b4c663cd..3dd10748d98b 100644
--- a/sysutils/container-diff/Makefile
+++ b/sysutils/container-diff/Makefile
@@ -1,29 +1,28 @@
 PORTNAME=	container-diff
 PORTVERSION=	0.17.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	12
 CATEGORIES=	sysutils
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Diff your Docker containers
 WWW=		https://github.com/GoogleContainerTools/container-diff
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
-USE_GITHUB=	nodefault
-GH_TUPLE=	golang:sys:v0.6.0:sys
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 PLIST_FILES=	bin/container-diff
 
-GH_ACCOUNT=	GoogleContainerTools
 USE_GITHUB=	yes
+GH_TUPLE=	GoogleContainerTools:container-diff:v${PORTVERSION} \
+		golang:sys:v0.6.0:sys
 
 pre-patch:
-	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
-	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+	@${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	@${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
 
 .include <bsd.port.mk>