diff --git a/src/command-line/index.js b/src/command-line/index.js
index a281f43b..5001f30a 100644
--- a/src/command-line/index.js
+++ b/src/command-line/index.js
@@ -1,6 +1,8 @@
 var program = require("commander");
 var pkg = require("../../package.json");
 
+program.version(pkg.version, "-v, --version");
+
 require("./start");
 require("./config");
 require("./list");
diff --git a/src/command-line/start.js b/src/command-line/start.js
index e8ba0e19..061dbbb9 100644
--- a/src/command-line/start.js
+++ b/src/command-line/start.js
@@ -4,10 +4,10 @@ var program = require("commander");
 var shout = require("../server");
 
 program
-	.option("-h, --host <ip>", "host")
+	.option("-H, --host <ip>", "host")
 	.option("-p, --port <port>", "port")
-	.option("    --public")
-	.option("    --private")
+	.option("    --public", "mode")
+	.option("    --private", "mode")
 	.command("start")
 	.description("Start the server")
 	.action(function() {