diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
index 96cbce9a13..194797bd82 100644
--- a/cmd/bundle/main.go
+++ b/cmd/bundle/main.go
@@ -84,6 +84,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"golang.org/x/tools/go/packages"
 )
@@ -233,7 +234,7 @@ func bundle(src, dst, dstpkg, prefix, buildTags string) ([]byte, error) {
 
 	fmt.Fprintf(&out, "// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.\n")
 	if *outputFile != "" && buildTags == "" {
-		fmt.Fprintf(&out, "//go:generate bundle %s\n", strings.Join(os.Args[1:], " "))
+		fmt.Fprintf(&out, "//go:generate bundle %s\n", strings.Join(quoteArgs(os.Args[1:]), " "))
 	} else {
 		fmt.Fprintf(&out, "//   $ bundle %s\n", strings.Join(os.Args[1:], " "))
 	}
@@ -447,6 +448,35 @@ func printSameLineComment(out *bytes.Buffer, comments []*ast.CommentGroup, fset
 	return pos
 }
 
+func quoteArgs(ss []string) []string {
+	// From go help generate:
+	//
+	// > The arguments to the directive are space-separated tokens or
+	// > double-quoted strings passed to the generator as individual
+	// > arguments when it is run.
+	//
+	// > Quoted strings use Go syntax and are evaluated before execution; a
+	// > quoted string appears as a single argument to the generator.
+	//
+	var qs []string
+	for _, s := range ss {
+		if s == "" || containsSpace(s) {
+			s = strconv.Quote(s)
+		}
+		qs = append(qs, s)
+	}
+	return qs
+}
+
+func containsSpace(s string) bool {
+	for _, r := range s {
+		if unicode.IsSpace(r) {
+			return true
+		}
+	}
+	return false
+}
+
 type flagFunc func(string)
 
 func (f flagFunc) Set(s string) error {