diff --git a/cmd/completion.go b/cmd/completion.go
deleted file mode 100644
index ca671a75b09..00000000000
--- a/cmd/completion.go
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright 2020 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-func newCompletionCmd() *cobra.Command {
-	completionCmd := &cobra.Command{
-		Use: "completion",
-		Long: `Output shell completion code for the specified shell (bash or zsh). 
-The shell code must be evaluated to provide interactive completion of kubebuilder commands.
-This can be done by sourcing ~/.bash_profile or ~/.bashrc.
-Detailed instructions on how to do this are available at docs/book/src/reference/completion.md
-`,
-		Example: `To load all completions run:
-$ . <(kubebuilder completion)
-To configure your shell to load completions for each session add to your .bashrc:
-$ echo -e "\n. <(kubebuilder completion)" >> ~/.bashrc
-`,
-	}
-	completionCmd.AddCommand(newZshCmd())
-	completionCmd.AddCommand(newBashCmd())
-	return completionCmd
-}
-
-func newBashCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "bash",
-		Short: "Generate bash completions",
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
-			return cmd.Root().GenBashCompletion(os.Stdout)
-		},
-		Example: `To load completion run:
-$ . <(kubebuilder completion bash)
-To configure your bash shell to load completions for each session add to your bashrc:
-$ echo -e "\n. <(kubebuilder completion bash)" >> ~/.bashrc
-`,
-	}
-}
-
-func newZshCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "zsh",
-		Short: "Generate zsh completions",
-		RunE: func(cmd *cobra.Command, cmdArgs []string) error {
-			return cmd.Root().GenZshCompletion(os.Stdout)
-		},
-		Example: `To load completion run:
-$ . <(kubebuilder completion zsh)
-To configure your zsh shell to load completions for each session add to your bashrc:
-$ echo -e "\n. <(kubebuilder completion zsh)" >> ~/.bashrc
-`,
-	}
-}
diff --git a/cmd/main.go b/cmd/main.go
index 0839bcd2ba4..223b6dc3067 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -27,6 +27,7 @@ import (
 
 func main() {
 	c, err := cli.New(
+		cli.WithCommandName("kubebuilder"),
 		cli.WithPlugins(
 			&pluginv2.Plugin{},
 			&pluginv3.Plugin{},
@@ -35,9 +36,9 @@ func main() {
 			&pluginv2.Plugin{},
 		),
 		cli.WithExtraCommands(
-			newCompletionCmd(),
 			version.NewCmd(),
 		),
+		cli.WithCompletion,
 	)
 	if err != nil {
 		log.Fatal(err)
diff --git a/docs/book/src/reference/completion.md b/docs/book/src/reference/completion.md
index 44e5ecdae98..10b4cd2259d 100644
--- a/docs/book/src/reference/completion.md
+++ b/docs/book/src/reference/completion.md
@@ -1,5 +1,5 @@
 # Enabling shell autocompletion
-The Kubebuilder completion script for Bash can be generated with the command `kubebuilder completion bash` as the Kubebuilder completion script for Zsh can be generated with the command `kubebuilder completion zsh`. 
+The Kubebuilder completion script can be generated with the command `kubebuilder completion [bash|zsh|fish|powershell]`. 
 Note that sourcing the completion script in your shell enables Kubebuilder autocompletion. 
 
 <aside class="note">
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index a80cd624729..2b0b0cd84f0 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -66,6 +66,9 @@ type cli struct {
 	// Whether the command is requesting help.
 	doGenericHelp bool
 
+	// Whether to add a completion command to the cli
+	completionCommand bool
+
 	// Plugins injected by options.
 	pluginsFromOptions map[string][]plugin.Base
 	// Default plugins injected by options. Only one plugin per project version
@@ -173,6 +176,12 @@ func WithExtraCommands(cmds ...*cobra.Command) Option {
 	}
 }
 
+// WithCompletion is an Option that adds the completion subcommand.
+func WithCompletion(c *cli) error {
+	c.completionCommand = true
+	return nil
+}
+
 // initialize initializes the cli.
 func (c *cli) initialize() error {
 	// Initialize cli with globally-relevant flags or flags that determine
@@ -345,6 +354,12 @@ func (c cli) buildRootCmd() *cobra.Command {
 		rootCmd.AddCommand(alphaCmd)
 	}
 
+	// kubebuilder completion
+	// Only add completion if requested
+	if c.completionCommand {
+		rootCmd.AddCommand(c.newCompletionCmd())
+	}
+
 	// kubebuilder create
 	createCmd := c.newCreateCmd()
 	// kubebuilder create api
diff --git a/pkg/cli/completion.go b/pkg/cli/completion.go
new file mode 100644
index 00000000000..50cf57f8433
--- /dev/null
+++ b/pkg/cli/completion.go
@@ -0,0 +1,82 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cli
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+func (c *cli) newCompletionCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:                   "completion [bash|zsh|powershell]", // TODO (requires spf13.cobra update): add fish
+		DisableFlagsInUseLine: true,
+		ValidArgs:             []string{"bash", "zsh", "powershell"},
+		Args:                  cobra.ExactValidArgs(1),
+		Short:                 "Generate completion script",
+		Long: fmt.Sprintf(`To load completions:
+
+Bash:
+
+$ source <(%[1]s completion bash)
+
+# To load completions for each session, execute once:
+Linux:
+  $ %[1]s completion bash > /etc/bash_completion.d/%[1]s
+MacOS:
+  $ %[1]s completion bash > /usr/local/etc/bash_completion.d/%[1]s
+
+Zsh:
+
+# If shell completion is not already enabled in your environment you will need
+# to enable it.  You can execute the following once:
+
+$ echo "autoload -U compinit; compinit" >> ~/.zshrc
+
+# To load completions for each session, execute once:
+$ %[1]s completion zsh > "${fpath[1]}/_%[1]s"
+
+# You will need to start a new shell for this setup to take effect.
+`, c.commandName),
+		/* TODO (requires spf13.cobra update): add to Long when adding fish
+		   `
+		   Fish:
+
+		   $ %[1]s completion fish | source
+
+		   # To load completions for each session, execute once:
+		   $ %[1]s completion fish > ~/.config/fish/completions/%[1]s.fish
+		   `
+		*/
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			switch args[0] {
+			case "bash":
+				err = cmd.Root().GenBashCompletion(os.Stdout)
+			case "zsh":
+				err = cmd.Root().GenZshCompletion(os.Stdout)
+			// TODO (requires spf13.cobra update): uncomment when adding fish
+			//case "fish":
+			//	err = cmd.Root().GenFishCompletion(os.Stdout, true)
+			case "powershell":
+				err = cmd.Root().GenPowerShellCompletion(os.Stdout)
+			}
+			return
+		},
+	}
+}