Index: head/security/ssh-vault/Makefile
===================================================================
--- head/security/ssh-vault/Makefile	(revision 438037)
+++ head/security/ssh-vault/Makefile	(revision 438038)
@@ -1,58 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=       ssh-vault
-PORTVERSION=    0.10.0
+PORTVERSION=    0.11.0
 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 \
-		ssh-vault:ssh2pem:228a306:ssh2pem \
+GH_TUPLE=	ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \
+		ssh-vault:ssh2pem:e6a4e6a:ssh2pem/src/github.com/ssh-vault/ssh2pem \
 		kr:pty:ce7fa45:pty \
 		keybase:go-keychain:fc62173:keychain
+GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 
 STRIP=		# stripping can break go binaries
 
 PLIST_FILES=	bin/ssh-vault
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/src/golang.org \
-	${WRKSRC}/src/github.com/ssh-vault/ssh-vault
-.for src in cmd a_test.go cache.go cache_test.go close.go create.go \
-	create_test.go edit.go encode.go getkey.go getkey_test.go shred.go \
-	shred_test.go vault.go vault_test.go view.go get_password.go \
-	get_password_prompt.go
-	@${MV} ${WRKSRC}/${src} \
-	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-.endfor
-	@${MV} ${WRKSRC_crypto}/${src} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/crypto
-	@${MV} ${WRKSRC_ssh2pem}/${src} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/ssh2pem
-	@${MKDIR} ${WRKSRC}/src/github.com/keybase
-	@${MV} ${WRKDIR}/go-keychain-fc62173 \
-		${WRKSRC}/src/github.com/keybase/go-keychain
-	@${MKDIR} ${WRKSRC}/src/github.com/kr
-	@${MV} ${WRKDIR}/pty-ce7fa45 \
-		${WRKSRC}/src/github.com/kr/pty
+	@${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} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-X main.version=${PORTVERSION}" -o ssh-vault cmd/ssh-vault/main.go;
+	"-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
 
 .include <bsd.port.mk>
Index: head/security/ssh-vault/distinfo
===================================================================
--- head/security/ssh-vault/distinfo	(revision 438037)
+++ head/security/ssh-vault/distinfo	(revision 438038)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1489874635
-SHA256 (ssh-vault-ssh-vault-0.10.0_GH0.tar.gz) = 9393da9e366ba76434c2aa2fbcc58e57d63f335ffac115fff305757bfa80609a
-SIZE (ssh-vault-ssh-vault-0.10.0_GH0.tar.gz) = 13916
+TIMESTAMP = 1491478341
+SHA256 (ssh-vault-ssh-vault-0.11.0_GH0.tar.gz) = 81f599e4a65840ae4ccbf0dd07605afdf42517652cb487635d5237e5ec2d3884
+SIZE (ssh-vault-ssh-vault-0.11.0_GH0.tar.gz) = 15090
 SHA256 (ssh-vault-crypto-ae180e0_GH0.tar.gz) = fe73e39078ecd1d077ddfdfb296c00eaa19c149856443259fe8964ff0951423f
 SIZE (ssh-vault-crypto-ae180e0_GH0.tar.gz) = 2062
-SHA256 (ssh-vault-ssh2pem-228a306_GH0.tar.gz) = c78c30ce6e3d2c5478375852006212c1511e37e0ac6a8419583ba4c4f31b2055
-SIZE (ssh-vault-ssh2pem-228a306_GH0.tar.gz) = 1250
+SHA256 (ssh-vault-ssh2pem-e6a4e6a_GH0.tar.gz) = 0e95ecd47c7a53015ba4a9ae398dae6bed361966d61bee4fae444a74c8036078
+SIZE (ssh-vault-ssh2pem-e6a4e6a_GH0.tar.gz) = 1280
 SHA256 (kr-pty-ce7fa45_GH0.tar.gz) = fc650f9aff13d91773731f8c2e83bf73ea04bb38091f96e48f11478bee7b148f
 SIZE (kr-pty-ce7fa45_GH0.tar.gz) = 4326
 SHA256 (keybase-go-keychain-fc62173_GH0.tar.gz) = f7220d91bd822f6edd794864ba7816e799a004ead07bb4b21515417c185766de
 SIZE (keybase-go-keychain-fc62173_GH0.tar.gz) = 2524740