diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go
index 3e54915122..b8a8c5f2e6 100644
--- a/src/cmd/dist/main.go
+++ b/src/cmd/dist/main.go
@@ -122,6 +122,8 @@ func main() {
 			if elfIsLittleEndian(os.Args[0]) {
 				gohostarch = "mipsle"
 			}
+		case strings.Contains(out, "riscv64"):
+			gohostarch = "riscv64"
 		case strings.Contains(out, "s390x"):
 			gohostarch = "s390x"
 		case gohostos == "darwin":