diff --git a/devel/godep/Makefile b/devel/godep/Makefile
index e06846263eb1..5da08e4e7cc9 100644
--- a/devel/godep/Makefile
+++ b/devel/godep/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	godep
-PORTVERSION=	0.0.0.2015061101
+PORTVERSION=	0.0.0.2015080301
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
@@ -10,9 +10,9 @@ COMMENT=	Godep helps build packages reproducibly
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	tools:DEFAULT kr:fs golang:tools
-GH_PROJECT=	godep:DEFAULT fs:fs tools:tools
-GH_TAGNAME=	e28aafa:DEFAULT 2788f0d:fs a6d2a42:tools
+GH_ACCOUNT=	tools
+GH_PROJECT=	godep
+GH_TAGNAME=	d8799f1
 
 PLIST_FILES=	bin/godep
 
@@ -20,16 +20,13 @@ STRIP=		# stripping can break go binaries
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-.for src in .gitignore License Readme.md dep.go doc.go get.go go.go main.go \
-	match_test.go path.go pkg.go restore.go rewrite.go rewrite_test.go \
-	save.go save_test.go update.go update_test.go util.go vcs.go
+.for src in .gitignore .travis.yml Godeps License Readme.md dep.go diff.go \
+	diff_test.go doc.go get.go go.go main.go match_test.go path.go pkg.go \
+	restore.go rewrite.go rewrite_test.go save.go save_test.go update.go \
+	update_test.go util.go vcs.go
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/tools/${PORTNAME}
 .endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/kr
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKSRC_fs} ${WRKSRC}/src/github.com/kr/fs
-	@${MV} ${WRKSRC_tools} ${WRKSRC}/src/golang.org/x/tools
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build
diff --git a/devel/godep/distinfo b/devel/godep/distinfo
index 0a4ac4f87143..d365221f656a 100644
--- a/devel/godep/distinfo
+++ b/devel/godep/distinfo
@@ -1,6 +1,2 @@
-SHA256 (tools-godep-0.0.0.2015061101-e28aafa_GH0.tar.gz) = a7dcdd7d7381e79e5c48f1abb44edabeed184c9c0aea3c1d58e8cafc57943fde
-SIZE (tools-godep-0.0.0.2015061101-e28aafa_GH0.tar.gz) = 20441
-SHA256 (kr-fs-2788f0d_GH0.tar.gz) = 51899cf8a55f8feefcdd33c04cf5e74937319d45ce0f04aa175188573f3284c9
-SIZE (kr-fs-2788f0d_GH0.tar.gz) = 4361
-SHA256 (golang-tools-a6d2a42_GH0.tar.gz) = f46a91af2efc4ad3bbb4c8196183e1d396fefe2b33d8720c4198a5585f06780e
-SIZE (golang-tools-a6d2a42_GH0.tar.gz) = 1625666
+SHA256 (tools-godep-0.0.0.2015080301-d8799f1_GH0.tar.gz) = d9d51806fd06f8d9a8e54518128d881c36e8720620d1fea11b754c2373983afc
+SIZE (tools-godep-0.0.0.2015080301-d8799f1_GH0.tar.gz) = 45986