diff --git a/ext/golang/go b/ext/golang/go
index 6b36535c..cd6b6202 160000
--- a/ext/golang/go
+++ b/ext/golang/go
@@ -1 +1 @@
-Subproject commit 6b36535cf382bce845dd2d272276e7ba350b0c6b
+Subproject commit cd6b6202dd1559b3ac63179b45f1833fcfbe7eca
diff --git a/ext/syncthing/src/github.com/syncthing/syncthing b/ext/syncthing/src/github.com/syncthing/syncthing
index 5a1ee7f0..28449f9f 160000
--- a/ext/syncthing/src/github.com/syncthing/syncthing
+++ b/ext/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit 5a1ee7f0b0a9c5e0edf5b7db5bc593d441c77110
+Subproject commit 28449f9f5bc8e5e994c5e9027dfc36c6f02d3a2c
diff --git a/make-go.bash b/make-go.bash
index 34cfeeb7..a0663c91 100755
--- a/make-go.bash
+++ b/make-go.bash
@@ -30,7 +30,7 @@ case "$1" in
     arm64)
         export GOOS=linux
         export GOARCH=arm64
-        export GOARM=8
+        unset GOARM
         ;;
     386)
         export GOOS=linux
diff --git a/make-syncthing.bash b/make-syncthing.bash
index 303e89ba..06e26b0e 100755
--- a/make-syncthing.bash
+++ b/make-syncthing.bash
@@ -17,7 +17,7 @@ case "$1" in
         export CGO_ENABLED=0
         export GOOS=linux
         export GOARCH=arm64
-        export GOARM=8
+        unset GOARM
         export TARGETDIR=$MYDIR$JNIDIR/arm64-v8a
         ;;
     386)
diff --git a/patches/golang/all/dns.patch b/patches/golang/all/dns.patch
index 5d3ea26d..0a393243 100644
--- a/patches/golang/all/dns.patch
+++ b/patches/golang/all/dns.patch
@@ -1,6 +1,6 @@
 --- /net/dnsconfig_unix.go	2016-08-20 08:14:05.763235602 -0400
 +++ /net/dnsconfig_unix.go	2016-08-20 08:14:05.763235602 -0400
-@@ -9,15 +9,58 @@
+@@ -9,16 +9,59 @@
  package net
  
  import (
@@ -8,6 +8,7 @@
  	"os"
 +	"os/exec"
 +	"strings"
+ 	"sync/atomic"
  	"time"
  )
  
@@ -27,7 +28,7 @@
 +		}
 +		output := strings.Trim(string(outputBytes), "\n")
 +		if ParseIP(output) != nil {
-+			servers = append(servers, output + ":53")
++			servers = append(servers, JoinHostPort(output, "53"))
 +		}
 +	}
 +
@@ -60,7 +61,7 @@
  type dnsConfig struct {
  	servers    []string      // server addresses (in host:port form) to use
  	search     []string      // rooted suffixes to append to local name
-@@ -40,7 +83,7 @@
+@@ -42,7 +85,7 @@ func dnsReadConfig(filename string) *dnsConfig {
  	}
  	file, err := open(filename)
  	if err != nil {
@@ -69,7 +70,7 @@
  		conf.search = dnsDefaultSearch()
  		conf.err = err
  		return conf
-@@ -49,7 +92,7 @@
+@@ -51,7 +94,7 @@ func dnsReadConfig(filename string) *dnsConfig {
  	if fi, err := file.file.Stat(); err == nil {
  		conf.mtime = fi.ModTime()
  	} else {
@@ -78,7 +79,7 @@
  		conf.search = dnsDefaultSearch()
  		conf.err = err
  		return conf
-@@ -126,7 +169,7 @@
+@@ -130,7 +173,7 @@ func dnsReadConfig(filename string) *dnsConfig {
  		}
  	}
  	if len(conf.servers) == 0 {