diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
index f6184529b695..8ea0705529d5 100644
--- a/net/syncthing-discosrv/Makefile
+++ b/net/syncthing-discosrv/Makefile
@@ -1,67 +1,69 @@
 # Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	syncthing-discosrv
 PORTVERSION=	0.0.0.2014110101
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
 		https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
 		https://codeload.github.com/golang/groupcache/legacy.tar.gz/${GROUPCACHE_COMMIT}?dummy=/:group3
 DISTFILES=	syncthing-discosrv-${PORTVERSION}.tar.gz:group1 \
 		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
 		golang-groupcache-${GROUPCACHE_COMMIT}${EXTRACT_SUFX}:group3
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 GH_ACCOUNT=	syncthing
 GH_PROJECT=	discosrv
 GH_COMMIT=	fcba610d30efa662d4435b3127300171aae7b0e9
 GH_TAGNAME=	${GH_COMMIT}
 
-SYNCTHING_VER=	0.10.5
+SYNCTHING_VER=	0.10.8
 GROUPCACHE_COMMIT=	d2a1805
 
 WRKSRC=		${WRKDIR}/discosrv-${GH_COMMIT}
 
 PLIST_FILES=	bin/syncthing-discosrv
 
 USE_RC_SUBR=	syncthing-discosrv
 USERS=		syncthing
 GROUPS=		syncthing
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/code.google.com/p
 	@${MKDIR} ${WRKSRC}/src/github.com/bkaradzic
 	@${MKDIR} ${WRKSRC}/src/github.com/golang
 	@${MKDIR} ${WRKSRC}/src/github.com/juju
 	@${MKDIR} ${WRKSRC}/src/github.com/syncthing
 	@${MKDIR} ${WRKSRC}/src/github.com/syndtr
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \
 		${WRKSRC}/src/github.com
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
 		${WRKSRC}/src/github.com/bkaradzic
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/juju/ratelimit \
 		${WRKSRC}/src/github.com/juju
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/goleveldb \
 		${WRKSRC}/src/github.com/syndtr
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/code.google.com/p/go.text \
 		${WRKSRC}/src/code.google.com/p
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/code.google.com/p/snappy-go \
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/gosnappy \
+		${WRKSRC}/src/github.com/syndtr
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/code.google.com/p/go.crypto \
 		${WRKSRC}/src/code.google.com/p
 	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \
 		${WRKSRC}/src/github.com/syncthing/syncthing
 	@${MV} ${WRKDIR}/golang-groupcache-${GROUPCACHE_COMMIT} \
 		${WRKSRC}/src/github.com/golang/groupcache
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
 	@${MV} ${WRKSRC}/discosrv-${GH_COMMIT} ${WRKSRC}/syncthing-discosrv
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-discosrv ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/net/syncthing-discosrv/distinfo b/net/syncthing-discosrv/distinfo
index c16a93798727..14855372183d 100644
--- a/net/syncthing-discosrv/distinfo
+++ b/net/syncthing-discosrv/distinfo
@@ -1,6 +1,6 @@
 SHA256 (syncthing-discosrv-0.0.0.2014110101.tar.gz) = 226f68ae1196cd4c51f169b4653b97a49f386868da10e4e0d57532d88619d6c5
 SIZE (syncthing-discosrv-0.0.0.2014110101.tar.gz) = 16471
-SHA256 (syncthing-0.10.5.tar.gz) = adaef4e63916f86f081f68615b740f39a9af08de6d4c5630876665cf229da241
-SIZE (syncthing-0.10.5.tar.gz) = 3013393
+SHA256 (syncthing-0.10.8.tar.gz) = a5ffb70c841ef333d567586c32826b9d60a27cc70c05e8a43b898e369390521d
+SIZE (syncthing-0.10.8.tar.gz) = 3061835
 SHA256 (golang-groupcache-d2a1805.tar.gz) = be22ff0c07a589fdb4665637787a2693e685e824a4ccb2bcfe8d9811d0c822a3
 SIZE (golang-groupcache-d2a1805.tar.gz) = 24094