Index: head/security/ssh-vault/Makefile
===================================================================
--- head/security/ssh-vault/Makefile	(revision 476919)
+++ head/security/ssh-vault/Makefile	(revision 476920)
@@ -1,37 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	ssh-vault
 PORTVERSION=	0.12.4
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Encrypt/decrypt using ssh keys
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.7:lang/go \
-		go.crypto>=20160709:security/go.crypto
-
 USES=		go
 
 USE_GITHUB=	yes
-GH_TUPLE=	ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \
+GH_TUPLE=	golang:crypto:c126467:gocrypto/src/golang.org/x/crypto \
+		golang:sys:bd9dbc1:gosys/src/golang.org/x/sys \
+		ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \
 		ssh-vault:ssh2pem:c1edc64:ssh2pem/src/github.com/ssh-vault/ssh2pem
+
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 
 PLIST_FILES=	bin/ssh-vault
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/golang.org
-	@${LN} -sf ${LOCALBASE}/share/go/src/golang.org/x ${WRKSRC}/src/golang.org/x
-
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
 	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
 	"-s -w -X main.version=${PORTVERSION}" -o ssh-vault cmd/ssh-vault/main.go;
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ssh-vault/ssh-vault/ssh-vault ${STAGEDIR}${PREFIX}/bin/ssh-vault
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ssh-vault/ssh-vault/ssh-vault \
+		${STAGEDIR}${PREFIX}/bin/ssh-vault
 
 .include <bsd.port.mk>
Index: head/security/ssh-vault/distinfo
===================================================================
--- head/security/ssh-vault/distinfo	(revision 476919)
+++ head/security/ssh-vault/distinfo	(revision 476920)
@@ -1,7 +1,11 @@
-TIMESTAMP = 1528401646
+TIMESTAMP = 1533942407
 SHA256 (ssh-vault-ssh-vault-0.12.4_GH0.tar.gz) = 73cd706b2318aae7722dc18312a221090f90919b446d42b8855f354032586bfc
 SIZE (ssh-vault-ssh-vault-0.12.4_GH0.tar.gz) = 20466
+SHA256 (golang-crypto-c126467_GH0.tar.gz) = af4ccc970d8ad62b042a0dcfa54d00c3b059840e61cd9023b059f848964b7b17
+SIZE (golang-crypto-c126467_GH0.tar.gz) = 1624160
+SHA256 (golang-sys-bd9dbc1_GH0.tar.gz) = 9dbb400f582be68636769b72b6618bc7f3b609a98e998713f9ee85b3ce680bc5
+SIZE (golang-sys-bd9dbc1_GH0.tar.gz) = 982758
 SHA256 (ssh-vault-crypto-ae180e0_GH0.tar.gz) = fe73e39078ecd1d077ddfdfb296c00eaa19c149856443259fe8964ff0951423f
 SIZE (ssh-vault-crypto-ae180e0_GH0.tar.gz) = 2062
 SHA256 (ssh-vault-ssh2pem-c1edc64_GH0.tar.gz) = a06595af99ffe330a6167250e53492b0738664d69c311fcb0f02e1cb6fea33a9
 SIZE (ssh-vault-ssh2pem-c1edc64_GH0.tar.gz) = 1523