diff --git a/Makefile b/Makefile
index 7cc6b45..3d9315e 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ $(DEBUG_APK):
 	
 # This target is also used by the F-Droid builder.
 release_aar:
+	(go version | grep -- "-ts") || (echo Must set GOBIN to Tailscale production toolchain; exit 1)
 	mkdir -p android/libs
 	go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.Long=$(VERSIONNAME) -X tailscale.com/version.Short=$(VERSIONNAME_SHORT) -X tailscale.com/version.GitCommit=$(TAILSCALE_COMMIT) -X tailscale.com/version.ExtraGitCommit=$(OUR_VERSION)" -tags xversion -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale
 
diff --git a/go.mod b/go.mod
index 98c6f0b..b13c243 100644
--- a/go.mod
+++ b/go.mod
@@ -10,5 +10,5 @@ require (
 	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
 	golang.zx2c4.com/wireguard v0.0.0-20210624150102-15b24b6179e0
 	inet.af/netaddr v0.0.0-20210602152128-50f8686885e3
-	tailscale.com v1.1.1-0.20210716192516-798b0da4703d
+	tailscale.com v1.1.1-0.20210722222248-d145c594ad6b
 )
diff --git a/go.sum b/go.sum
index eee69c2..b73d5f2 100644
--- a/go.sum
+++ b/go.sum
@@ -828,6 +828,10 @@ tailscale.com v1.1.1-0.20210715222212-1bb6abc604c1 h1:A32MyGc832W3fuCpnhm0ZPhM8x
 tailscale.com v1.1.1-0.20210715222212-1bb6abc604c1/go.mod h1:/vVQb07eMXdBC9zIBeZ0NPuZaT9nbDxHAs07ohMDPCo=
 tailscale.com v1.1.1-0.20210716192516-798b0da4703d h1:/YNcDLq2xyHk67FqebaRkQSpUOxa0fJS4oQxZhanQKg=
 tailscale.com v1.1.1-0.20210716192516-798b0da4703d/go.mod h1:eNWcEtAgFy+iVHMVzLYhXiwzsMey8UQBAxC43f6aCjI=
+tailscale.com v1.1.1-0.20210721194525-3daf27eaada3 h1:8FvixORxNExsXwzixu7XT7XPlku1ZysnW7VoSLj3Bvg=
+tailscale.com v1.1.1-0.20210721194525-3daf27eaada3/go.mod h1:eNWcEtAgFy+iVHMVzLYhXiwzsMey8UQBAxC43f6aCjI=
+tailscale.com v1.1.1-0.20210722222248-d145c594ad6b h1:Sgb2M+NoN0LGhMQJCVePriGXGO7VmVwQ8vvdhU9JZ8Q=
+tailscale.com v1.1.1-0.20210722222248-d145c594ad6b/go.mod h1:eNWcEtAgFy+iVHMVzLYhXiwzsMey8UQBAxC43f6aCjI=
 tailscale.com v1.10.0 h1:3EWYxpXkCmXsMh1WgqoEjQ/xalxzxU+YD5ZmtaHS5cY=
 tailscale.com v1.10.0/go.mod h1:kgFF5AZPTltwdXjX2/ci4ghlcO3qKNWVIjD9s39pr8c=
 tailscale.com v1.10.1 h1:6N1lARN/Oee1qFBWTCrBS/wF4M9tBXIsrFaxndrlsoI=