diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index 8949949bd2..1141981329 100644
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -316,8 +316,7 @@ func bootstrapFixImports(srcFile string) string {
 			inBlock = false
 			continue
 		}
-		if strings.HasPrefix(line, `import "`) || strings.HasPrefix(line, `import . "`) ||
-			inBlock && (strings.HasPrefix(line, "\t\"") || strings.HasPrefix(line, "\t. \"") || strings.HasPrefix(line, "\texec \"") || strings.HasPrefix(line, "\trtabi \"") || strings.HasPrefix(line, "\tpgoir \"")) {
+		if strings.HasPrefix(line, `import `) || inBlock {
 			line = strings.Replace(line, `"cmd/`, `"bootstrap/cmd/`, -1)
 			for _, dir := range bootstrapDirs {
 				if strings.HasPrefix(dir, "cmd/") {