diff --git a/command/completion/completion.go b/command/completion/completion.go
index 06bbc4c3b..749c5386d 100644
--- a/command/completion/completion.go
+++ b/command/completion/completion.go
@@ -39,6 +39,7 @@ $ step completion bash >> ~/.bash_completion
 			}
 			fmt.Println("bash")
 			fmt.Println("zsh")
+			fmt.Println("fish")
 		},
 	}
 
@@ -102,6 +103,8 @@ func Completion(ctx *cli.Context) error {
 		fmt.Print(bash)
 	case "zsh":
 		fmt.Print(zsh)
+	case "fish":
+		fmt.Print(ctx.App.ToFishCompletion())
 	default:
 		return errors.Errorf("unsupported shell %s", shell)
 	}