diff --git a/srcpkgs/relaysrv/template b/srcpkgs/relaysrv/template
deleted file mode 100644
index 0aba5e0f4b..0000000000
--- a/srcpkgs/relaysrv/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'relaysrv'
-pkgname=relaysrv
-version=0.12.18
-revision=2
-build_style=go
-go_import_path="github.com/syncthing/relaysrv"
-hostmakedepends="git-perl"
-short_desc="Relay server for syncthing"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="MIT"
-homepage="https://github.com/syncthing/relaysrv"
-distfiles="https://github.com/syncthing/relaysrv/archive/v${version}.tar.gz"
-checksum=ce21cd29bd091c3dbdc138dc94ede63b6d815b664b615a87a4f1b01ee5f2ce35
-
-system_accounts="relaysrv"
-relaysrv_homedir="/var/lib/relaysrv"
-
-make_dirs="
-/var/log/relaysrv 700 root root
-/var/lib/relaysrv 700 relaysrv relaysrv"
-
-pre_build() {
-	env -u GOARCH -u GOARM go get -x -v github.com/tools/godep
-	$GOPATH/bin/godep restore -v
-	rm $GOPATH/bin/godep
-}
-
-post_install() {
-	vlicense LICENSE
-	vsv relaysrv
-}
diff --git a/srcpkgs/syncthing-relaysrv b/srcpkgs/syncthing-relaysrv
new file mode 120000
index 0000000000..ff37238c0a
--- /dev/null
+++ b/srcpkgs/syncthing-relaysrv
@@ -0,0 +1 @@
+syncthing/
\ No newline at end of file
diff --git a/srcpkgs/relaysrv/files/relaysrv/log/run b/srcpkgs/syncthing/files/relaysrv/log/run
similarity index 100%
rename from srcpkgs/relaysrv/files/relaysrv/log/run
rename to srcpkgs/syncthing/files/relaysrv/log/run
diff --git a/srcpkgs/relaysrv/files/relaysrv/run b/srcpkgs/syncthing/files/relaysrv/run
similarity index 100%
rename from srcpkgs/relaysrv/files/relaysrv/run
rename to srcpkgs/syncthing/files/relaysrv/run
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index f851afe9e0..d18f323637 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,10 +1,10 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=0.13.6
+version=0.13.7
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
-go_package="${go_import_path}/cmd/syncthing"
+go_package="${go_import_path}/cmd/relaysrv ${go_import_path}/cmd/syncthing"
 go_build_tags="noupgrade"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Open Source Continuous File Synchronization"
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="MPLv2"
 homepage="http://syncthing.net/"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=df99789c3ab017edb39522d0d9cccac68e626f2a59f7a55588b282d65eadf2f3
+checksum=c487a489504e48bc7a94f25322da5485c23b3a8e3df2832b2454556ab86552c8
 
 pre_build() {
 	GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go
@@ -22,3 +22,22 @@ post_install() {
 	vlicense LICENSE
 	vdoc README.md
 }
+
+syncthing-relaysrv_package() {
+	short_desc+="- relay server"
+	license="MIT"
+	replaces="relaysrv>=0.12.18_2"
+	provides="relaysrv-${version}_${revision}"
+	system_accounts="relaysrv"
+	relaysrv_homedir="/var/lib/relaysrv"
+
+	make_dirs="
+	/var/log/relaysrv 700 root root
+	/var/lib/relaysrv 700 relaysrv relaysrv"
+
+	pkg_install() {
+		vmove usr/bin/relaysrv
+		vlicense cmd/relaysrv/LICENSE
+		vsv relaysrv
+	}
+}