diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go
index 0a419e465f..e99375f538 100644
--- a/src/cmd/dist/util.go
+++ b/src/cmd/dist/util.go
@@ -389,6 +389,10 @@ func xgetgoarm() string {
 		// sense to auto-detect the setting.
 		return "7"
 	}
+	if goos == "windows" {
+		// windows/arm only works with ARMv7 executables.
+		return "7"
+	}
 	if gohostarch != "arm" || goos != gohostos {
 		// Conservative default for cross-compilation.
 		return "5"