diff --git a/Makefile b/Makefile
index 7cfc09f..0e97c45 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ tag_release:
 	git tag -a "$(VERSION_LONG)"
 
 $(DEBUG_APK):
+	(go version | grep -- "-ts") || (echo Must set have Tailscale production toolchain in PATH; exit 1)
 	mkdir -p android/libs
 	go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale
 	(cd android && ./gradlew assemblePlayDebug)
@@ -38,7 +39,7 @@ $(DEBUG_APK):
 	
 # This target is also used by the F-Droid builder.
 release_aar:
-	(${GOBIN}/go version | grep -- "-ts") || (echo Must set GOBIN to Tailscale production toolchain; exit 1)
+	(go version | grep -- "-ts") || (echo Must set have Tailscale production toolchain in PATH; 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