diff --git a/net/Makefile b/net/Makefile
index 3f9aaad9b264..3267fc9e1766 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1152,6 +1152,7 @@
     SUBDIR += svnup
     SUBDIR += syncthing
     SUBDIR += syncthing-cli
+    SUBDIR += syncthing-discosrv
     SUBDIR += tableutil
     SUBDIR += tac_plus-libradius
     SUBDIR += tac_plus4
diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
new file mode 100644
index 000000000000..af9aae228d60
--- /dev/null
+++ b/net/syncthing-discosrv/Makefile
@@ -0,0 +1,63 @@
+# Created by: Steve Wills <swills@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	syncthing-discosrv
+PORTVERSION=	0.0.0.2014081401
+CATEGORIES=	net
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
+		https://codeload.github.com/juju/ratelimit/legacy.tar.gz/f9f36d1?dummy=/:group2 \
+		https://github.com/syncthing/syncthing/archive/v0.9.4.tar.gz?dummy=/:group3 \
+		https://codeload.github.com/calmh/xdr/legacy.tar.gz/e1714bb?dummy=/:group4 \
+		LOCAL/swills:group5 \
+		https://codeload.github.com/bkaradzic/go-lz4/legacy.tar.gz/77e2ba8?dummy=/:group6 \
+		https://codeload.github.com/golang/groupcache/legacy.tar.gz/8b25adc?dummy=/:group7
+DISTFILES=	syncthing-discosrv-0.0.0.2014081401.tar.gz:group1 \
+		juju-ratelimit-f9f36d1${EXTACT_SUFX}:group2 \
+		syncthing-0.9.4${EXTRACT_SUFX}:group3 \
+		calmh-xdr-e1714bb${EXTRACT_SUFX}:group4 \
+		text.go-d65bffbc88a1${EXTRACT_SUFX}:group5 \
+		bkaradzic-go-lz4-77e2ba8${EXTRACT_SUFX}:group6 \
+		golang-groupcache-8b25adc${EXTRACT_SUFX}:group7
+
+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=	f2b3bb0
+GH_TAGNAME=	${GH_COMMIT}
+
+WRKSRC=		${WRKDIR}/discosrv-f2b3bb063f83f24d6c6e10013ea467d5967eb0cf
+
+PLIST_FILES=	bin/syncthing-discosrv
+
+post-patch:
+	cd ${WRKSRC} ; \
+		${MKDIR} src/github.com/juju ; \
+		${MKDIR} src/github.com/calmh ; \
+		${MKDIR} src/code.google.com/p ; \
+		${MKDIR} src/github.com/bkaradzic ; \
+		${MKDIR} src/github.com/syncthing/syncthing ; \
+		${MKDIR} src/github.com/golang ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/discover src/github.com/syncthing/syncthing/ ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/beacon src/github.com/syncthing/syncthing/ ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/events src/github.com/syncthing/syncthing/ ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/logger src/github.com/syncthing/syncthing/ ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/protocol src/github.com/syncthing/syncthing/ ; \
+		${MV} ${WRKDIR}/juju-ratelimit-f9f36d1 src/github.com/juju/ratelimit ; \
+		${MV} ${WRKDIR}/calmh-xdr-e1714bb src/github.com/calmh/xdr ; \
+		${MV} ${WRKDIR}/text.go-d65bffbc88a1/ src/code.google.com/p/go.text ; \
+		${MV} ${WRKDIR}/bkaradzic-go-lz4-77e2ba8 src/github.com/bkaradzic/go-lz4 ; \
+		${MV} ${WRKDIR}/golang-groupcache-8b25adc src/github.com/golang/groupcache ; \
+		${MV} ${WRKDIR}/syncthing-0.9.4/luhn src/github.com/syncthing/syncthing
+
+do-build:
+	cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
+	${MV} ${WRKSRC}/discosrv-f2b3bb063f83f24d6c6e10013ea467d5967eb0cf ${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
new file mode 100644
index 000000000000..667f4c067ca4
--- /dev/null
+++ b/net/syncthing-discosrv/distinfo
@@ -0,0 +1,14 @@
+SHA256 (syncthing-discosrv-0.0.0.2014081401.tar.gz) = 2d3280b7ed18338516e7c00f1658dd4f5fc38aecba26f54f6da9a27886294a54
+SIZE (syncthing-discosrv-0.0.0.2014081401.tar.gz) = 3370
+SHA256 (juju-ratelimit-f9f36d1) = d2117682d9ef68764cfdd4de51b4d150cd2c6c0b6a9fcaa50d5891443b42285a
+SIZE (juju-ratelimit-f9f36d1) = 7382
+SHA256 (syncthing-0.9.4.tar.gz) = e1cfbc3055ca26662d9f3664bd236357f84f6523360cc2aa4c3e83fcd74fcfad
+SIZE (syncthing-0.9.4.tar.gz) = 1814400
+SHA256 (calmh-xdr-e1714bb.tar.gz) = 354133594fc70dac499a44ffd6d857f1f730345f8db3d07def4e38daec5ec791
+SIZE (calmh-xdr-e1714bb.tar.gz) = 9250
+SHA256 (text.go-d65bffbc88a1.tar.gz) = 5b87e4dddc48c363bf190982a0d229ed5c9b57793ae4ec68004dc1c2f2a31309
+SIZE (text.go-d65bffbc88a1.tar.gz) = 3231005
+SHA256 (bkaradzic-go-lz4-77e2ba8.tar.gz) = 8d6a3f73bb2e21a64292d14af1a8466707c14f71b70d48fde317746cd2ac8d0e
+SIZE (bkaradzic-go-lz4-77e2ba8.tar.gz) = 232876
+SHA256 (golang-groupcache-8b25adc.tar.gz) = 458f35584a960462eec4b50e9068ff6095034c27db2a53cbe22e3e3e9e3fa35d
+SIZE (golang-groupcache-8b25adc.tar.gz) = 23823
diff --git a/net/syncthing-discosrv/pkg-descr b/net/syncthing-discosrv/pkg-descr
new file mode 100644
index 000000000000..f0c9d53f46cb
--- /dev/null
+++ b/net/syncthing-discosrv/pkg-descr
@@ -0,0 +1,3 @@
+Syncthing discovery server
+
+WWW: http://syncthing.net/