diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 25ceaaf382a..4f2ef34fdcd 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2018/09/04 12:46:19 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2019/02/07 15:50:09 edd Exp $
 
 COMMENT =	open decentralized synchronization utility
 
-V =		0.14.47
+V =		1.0.1
 DISTNAME =	syncthing-${V}
 DISTFILES =	syncthing-source-v${V}${EXTRACT_SUFX}
-REVISION =	0
 
 CATEGORIES =	net
 HOMEPAGE =	https://syncthing.net/
@@ -31,11 +30,15 @@ do-build:
 	cd ${WRKSRC} && ${MODGO_CMD} run build.go \
 		-version v${V} -no-upgrade
 
+# Some tests fail, but they are bugs in the test suite itself, not Syncthing.
+# We are working with upstream to fix these:
+# https://forum.syncthing.net/t/openbsd-test-debugging/12799
 do-test:
 	cd ${WRKSRC} && ${MODGO_CMD} run build.go test
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/stcli ${PREFIX}/bin/
 .for sec in 1 5 7
 	${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/
 .endfor
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 88fe0dea3f9..3f1fb9f6612 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.47.tar.gz) = krNTXKPqeyfFsux3EIiGXNbpHYEaCBa+OaYoOjBn5vM=
-SIZE (syncthing-source-v0.14.47.tar.gz) = 10496524
+SHA256 (syncthing-source-v1.0.1.tar.gz) = w2KR786nkN+ds7Z6OaZOMqdzMkiava6CYKKV2ukBWj0=
+SIZE (syncthing-source-v1.0.1.tar.gz) = 6876569
diff --git a/net/syncthing/patches/patch-build_go b/net/syncthing/patches/patch-build_go
index bdb09babed8..01eb4733255 100644
--- a/net/syncthing/patches/patch-build_go
+++ b/net/syncthing/patches/patch-build_go
@@ -1,8 +1,29 @@
-$OpenBSD: patch-build_go,v 1.6 2018/02/24 10:14:24 bket Exp $
+$OpenBSD: patch-build_go,v 1.7 2019/02/07 15:50:09 edd Exp $
 Index: build.go
 --- build.go.orig
 +++ build.go
-@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta
+@@ -186,6 +186,20 @@ var targets = map[string]target{
+ 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
+ 		},
+ 	},
++	"stcli": {
++		name:        "stcli",
++		debname:     "stcli",
++		debdeps:     []string{"libc6"},
++		description: "Syncthing Commandline Interface",
++		buildPkg:    "github.com/syncthing/syncthing/cmd/stcli",
++		binaryName:  "stcli", // .exe will be added automatically for Windows builds
++		archiveFiles: []archiveFile{
++			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
++		},
++		installationFiles: []archiveFile{
++			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
++		},
++	},
+ }
+ 
+ func init() {
+@@ -490,7 +504,7 @@ func appendParameters(args []string, tags []string, ta
  
  	if !debugBinary {
  		// Regular binaries get version tagged and skip some debug symbols
diff --git a/net/syncthing/pkg/PLIST b/net/syncthing/pkg/PLIST
index d9ca5a66e15..b8b0044c0a1 100644
--- a/net/syncthing/pkg/PLIST
+++ b/net/syncthing/pkg/PLIST
@@ -1,7 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:19 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2019/02/07 15:50:09 edd Exp $
 @newgroup _syncthing:768
 @newuser _syncthing:768:_syncthing:daemon:Syncthing user:${VARBASE}/syncthing:/sbin/nologin
+@rcscript ${RCDIR}/syncthing
+@owner _syncthing
+@group _syncthing
+@sample ${VARBASE}/syncthing/
+@extraunexec rm -rf ${VARBASE}/syncthing/{.,}*
+@owner
+@group
 @bin bin/syncthing
+@bin bin/stcli
 @man man/man1/stdiscosrv.1
 @man man/man1/strelaysrv.1
 @man man/man1/syncthing.1
@@ -19,8 +27,3 @@
 @man man/man7/syncthing-security.7
 @man man/man7/syncthing-versioning.7
 share/doc/pkg-readmes/${PKGSTEM}
-@rcscript ${RCDIR}/syncthing
-@owner _syncthing
-@group _syncthing
-@sample ${VARBASE}/syncthing/
-@extraunexec rm -rf ${VARBASE}/syncthing/{.,}*