Index: head/net/syncthing-inotify/Makefile
===================================================================
--- head/net/syncthing-inotify/Makefile	(revision 450028)
+++ head/net/syncthing-inotify/Makefile	(revision 450029)
@@ -1,30 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing-inotify
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Syncthing inotify monitor
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing 
-GH_TUPLE=	cenkalti:backoff:9831e1e:backoff/src/github.com/cenkalti/backoff \
-		zillode:notify:2da5cc9:notify/src/github.com/zillode/notify \
-		syncthing:syncthing:v0.13.4:ignore/src/github.com/syncthing/syncthing
-
-STRIP=		# stripping can break go binaries
-
+GH_SUBDIR=	src/github.com/syncthing/syncthing-inotify
 PLIST_FILES=	bin/syncthing-inotify
 
 do-build:
-	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
-	@${MV} ${WRKSRC}/syncthing-inotify-${PORTVERSION} ${WRKSRC}/syncthing-inotify
+	@cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-inotify ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/net/syncthing-inotify/distinfo
===================================================================
--- head/net/syncthing-inotify/distinfo	(revision 450028)
+++ head/net/syncthing-inotify/distinfo	(revision 450029)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1469905389
-SHA256 (syncthing-syncthing-inotify-v0.8.3_GH0.tar.gz) = 3bbcce6788b44019472205c000bed2b3255a2ee08c0d20a93a9e7b22c73f3d45
-SIZE (syncthing-syncthing-inotify-v0.8.3_GH0.tar.gz) = 21849
+TIMESTAMP = 1505682602
+SHA256 (syncthing-syncthing-inotify-v0.8.7_GH0.tar.gz) = bf7a71695206c765cf407d85656f6f0f8be1715af3d3bb7f81985f749162a6b2
+SIZE (syncthing-syncthing-inotify-v0.8.7_GH0.tar.gz) = 995241
 SHA256 (cenkalti-backoff-9831e1e_GH0.tar.gz) = aadaf18958680eeab6bcb0ddce87b5654fb94bc7f19fb4bb9464f53a1ce5099c
 SIZE (cenkalti-backoff-9831e1e_GH0.tar.gz) = 6415
 SHA256 (zillode-notify-2da5cc9_GH0.tar.gz) = 55f9f78ad903d8f626637e35463de900b89e872d1d9b39f2986fc7486517a9d8
 SIZE (zillode-notify-2da5cc9_GH0.tar.gz) = 55099
 SHA256 (syncthing-syncthing-v0.13.4_GH0.tar.gz) = c7ecb7ace4837295a03fc72d0b133d2ec149e412bd998d9247d7d4504ef0f64b
 SIZE (syncthing-syncthing-v0.13.4_GH0.tar.gz) = 3937983