diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
index c33f7b502059..168e5e62f832 100644
--- a/net/syncthing-discosrv/Makefile
+++ b/net/syncthing-discosrv/Makefile
@@ -2,21 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing-discosrv
-PORTVERSION=	0.0.0.2015062601
-PORTREVISION=	3
+PORTVERSION=	0.0.0.2015092201
 CATEGORIES=	net
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
 
-BUILD_DEPENDS=	go14>=1.4:${PORTSDIR}/lang/go14
+BUILD_DEPENDS=	go>=1.5:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing golang:gc
-GH_PROJECT=	discosrv syncthing:st groupcache:gc
-GH_TAGNAME=	4c705ff v${SYNCTHING_VER}:st 604ed57:gc
-
-SYNCTHING_VER=	0.11.18
+GH_ACCOUNT=	syncthing
+GH_PROJECT=	discosrv
+GH_TAGNAME=	2062f77
 
 PLIST_FILES=	bin/syncthing-discosrv
 
@@ -26,16 +23,8 @@ GROUPS=		syncthing
 
 STRIP=		# stripping can break go binaries
 
-post-patch:
-	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/ ${WRKSRC}
-	@${MKDIR} ${WRKSRC}/src/github.com/golang
-	@${MV} ${WRKSRC_st} ${WRKSRC}/src/github.com/syncthing/syncthing
-	@${MV} ${WRKSRC_gc} \
-		${WRKSRC}/src/github.com/golang/groupcache
-
 do-build:
-	@cd ${WRKSRC} ; ${SETENV} PATH=${PATH}:${LOCALBASE}/go14/bin \
-	GOPATH=${WRKSRC} go build
+	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC}/Godeps/_workspace:${WRKSRC} go build
 	@${MV} ${WRKSRC}/discosrv-${GH_TAGNAME} ${WRKSRC}/syncthing-discosrv
 
 do-install:
diff --git a/net/syncthing-discosrv/distinfo b/net/syncthing-discosrv/distinfo
index 19ccdf55b4c4..2513242052db 100644
--- a/net/syncthing-discosrv/distinfo
+++ b/net/syncthing-discosrv/distinfo
@@ -1,6 +1,2 @@
-SHA256 (syncthing-discosrv-0.0.0.2015062601-4c705ff_GH0.tar.gz) = 231d5456e4fd328c31fb4f9b2a8cf75ffac9cdc453d9176f6b7a4f1176506e26
-SIZE (syncthing-discosrv-0.0.0.2015062601-4c705ff_GH0.tar.gz) = 5227
-SHA256 (golang-groupcache-604ed57_GH0.tar.gz) = 691b695141404ea5903a490a0abfdc5b89591eb654166a364b65a5785fc85b65
-SIZE (golang-groupcache-604ed57_GH0.tar.gz) = 24198
-SHA256 (syncthing-syncthing-v0.11.18_GH0.tar.gz) = fd93392687e545e2b779d10754e24cd49ecbfc03cabaceac381b5a3e69693be6
-SIZE (syncthing-syncthing-v0.11.18_GH0.tar.gz) = 3391683
+SHA256 (syncthing-discosrv-0.0.0.2015092201-2062f77_GH0.tar.gz) = ceed277b47d303898eda1c4fad520343252e7d058daf75405522468af091fc0e
+SIZE (syncthing-discosrv-0.0.0.2015092201-2062f77_GH0.tar.gz) = 969977