diff --git a/pkg/cmd/completion.go b/pkg/cmd/completion.go
new file mode 100644
index 0000000..e889ea4
--- /dev/null
+++ b/pkg/cmd/completion.go
@@ -0,0 +1,64 @@
+// Copyright © 2018 Jesse Swidler <jswidler@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package cmd
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+// completionCmd represents the completion command
+var completionCmd = &cobra.Command{
+	Use:    "completion",
+	Hidden: true,
+	Short:  "Generates bash/zsh completion scripts",
+
+	Run: func(cmd *cobra.Command, args []string) {
+		if zsh && output == "" {
+			rootCmd.GenZshCompletion(os.Stdout)
+		} else if zsh {
+			rootCmd.GenZshCompletionFile(output)
+		} else if output == "" {
+			rootCmd.GenBashCompletion(os.Stdout)
+		} else {
+			rootCmd.GenBashCompletionFile(output)
+		}
+	},
+}
+
+var output string
+
+func addOutputFlag(cmd *cobra.Command) {
+	cmd.Flags().StringVarP(&output, "output", "o", "", "output to a file")
+}
+
+var zsh bool
+
+func addZshFlag(cmd *cobra.Command) {
+	cmd.Flags().BoolVarP(&zsh, "zsh", "z", false, "create zsh autocomplete instead of bash")
+}
+
+func init() {
+	addOutputFlag(completionCmd)
+	addZshFlag(completionCmd)
+	rootCmd.AddCommand(completionCmd)
+}
diff --git a/pkg/cmd/zzzroot.go b/pkg/cmd/zzzroot.go
index edf0548..a8cb52a 100644
--- a/pkg/cmd/zzzroot.go
+++ b/pkg/cmd/zzzroot.go
@@ -64,6 +64,7 @@ var cmdOrder = []string{
 	"add", "mv", "rm",
 	"status", "commit",
 	"open", "close",
+	"ls",
 }
 
 func init() {