diff --git a/lib/start-server.js b/lib/start-server.js
index 66a17aa2e6..857de12aa3 100644
--- a/lib/start-server.js
+++ b/lib/start-server.js
@@ -15,10 +15,11 @@ require("babel-register")({
   presets: ["react"]
 });
 
-let port = 3000;
-if (process.argv.length > 2) {
-  port = process.argv[2];
-}
+const program = require("commander");
+
+program.option("--port <number>", "Specify port number").parse(process.argv);
+
+const port = program.port || 3000;
 
 const server = require("./server/server.js");
 server(port);
diff --git a/package.json b/package.json
index 90f4a8686d..8884377617 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "babel-traverse": "^6.25.0",
     "babylon": "^6.17.4",
     "classnames": "^2.2.5",
+    "commander": "^2.11.0",
     "express": "^4.15.3",
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",