diff --git a/commands/help.go b/commands/help.go
index 8199150ae9a70b02758ecf095bf6c99c1de5fd62..871a301ee32bc5a82db941c77ec5e0a80ff9b9aa 100644
--- a/commands/help.go
+++ b/commands/help.go
@@ -17,7 +17,7 @@ var cmdHelp = &Command{
 func init() {
 	cmdHelp.Run = runHelp
 
-	CmdRunner.Use(cmdHelp)
+	CmdRunner.Use(cmdHelp, "--help")
 }
 
 func runHelp(cmd *Command, args *Args) {
diff --git a/commands/runner.go b/commands/runner.go
index f4494132625ba18c545e2acadfe1d369445acbf6..fe599697e921abdb459af95825d5a8711f730d14 100644
--- a/commands/runner.go
+++ b/commands/runner.go
@@ -54,8 +54,11 @@ func (r *Runner) All() map[string]*Command {
 	return r.commands
 }
 
-func (r *Runner) Use(command *Command) {
+func (r *Runner) Use(command *Command, aliases ...string) {
 	r.commands[command.Name()] = command
+	if len(aliases) > 0 {
+		r.commands[aliases[0]] = command
+	}
 }
 
 func (r *Runner) Lookup(name string) *Command {
diff --git a/commands/version.go b/commands/version.go
index c3850143ce5d9beaa6307b9c6cd0d542e4ab7799..e8fc0556790ce9e8ca31f7c78fad1754443ba027 100644
--- a/commands/version.go
+++ b/commands/version.go
@@ -19,7 +19,7 @@ var cmdVersion = &Command{
 }
 
 func init() {
-	CmdRunner.Use(cmdVersion)
+	CmdRunner.Use(cmdVersion, "--version")
 }
 
 func runVersion(cmd *Command, args *Args) {