diff --git a/cmd/generate.go b/cmd/generate.go
index cc4aedc08..3a0b5d428 100644
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -17,12 +17,13 @@ import (
 
 var CmdGenerate = cli.Command{
 	Name:  "generate",
-	Usage: "Generate web server configuration files",
+	Usage: "Generate self-signed certificate, apache and nginx configuration files",
 	Description: `Generate configuration files to use a web server as a proxy for Gogs.`,
 	Flags: []cli.Flag{
 		cli.StringFlag{"config, c", "custom/conf/app.ini", "Custom configuration file path", ""},
 	},
 	Subcommands: []cli.Command{
+		CmdCert,
 		{
 			Name: "apache",
 			Usage: "generate Apache configuration file",
diff --git a/gogs.go b/gogs.go
index 1a8393c1c..29eaedbb6 100644
--- a/gogs.go
+++ b/gogs.go
@@ -34,7 +34,6 @@ func main() {
 		cmd.CmdServ,
 		cmd.CmdUpdate,
 		cmd.CmdDump,
-		cmd.CmdCert,
 		cmd.CmdGenerate,
 	}
 	app.Flags = append(app.Flags, []cli.Flag{}...)