diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index 453b37285f..62f9693210 100644
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -113,6 +113,8 @@ var ignoreSuffixes = []string{
 	// with PGO. And as it is not a text file the import path
 	// rewrite will break it.
 	".pgo",
+	// Skip editor backup files.
+	"~",
 }
 
 var tryDirs = []string{