diff --git a/src/cmd/compile/fmt_test.go b/src/cmd/compile/fmt_test.go
index 3f329dea9cc..7342b5492bf 100644
--- a/src/cmd/compile/fmt_test.go
+++ b/src/cmd/compile/fmt_test.go
@@ -673,6 +673,7 @@ var knownFormats = map[string]string{
 	"int %-12d":                                       "",
 	"int %-6d":                                        "",
 	"int %-8o":                                        "",
+	"int %02d":                                        "",
 	"int %6d":                                         "",
 	"int %c":                                          "",
 	"int %d":                                          "",
diff --git a/src/cmd/compile/internal/ssa/compile.go b/src/cmd/compile/internal/ssa/compile.go
index 8a2e358c118..82b9e2cbce8 100644
--- a/src/cmd/compile/internal/ssa/compile.go
+++ b/src/cmd/compile/internal/ssa/compile.go
@@ -123,7 +123,7 @@ var dumpFileSeq int
 // output.
 func (f *Func) dumpFile(phaseName string) {
 	dumpFileSeq++
-	fname := fmt.Sprintf("%s__%s_%d.dump", phaseName, f.Name, dumpFileSeq)
+	fname := fmt.Sprintf("%s_%02d__%s.dump", f.Name, dumpFileSeq, phaseName)
 	fname = strings.Replace(fname, " ", "_", -1)
 	fname = strings.Replace(fname, "/", "_", -1)
 	fname = strings.Replace(fname, ":", "_", -1)