diff --git a/plugins/c9.cli/cli.js b/plugins/c9.cli/cli.js
index 6c0ec08a..42cda13f 100755
--- a/plugins/c9.cli/cli.js
+++ b/plugins/c9.cli/cli.js
@@ -47,6 +47,11 @@ define(function(require, exports, module) {
             optimist = require('optimist');
             
             if (!module || !commands[module]) {
+                if (process.argv.indexOf("--version") != -1) {
+                    console.log(require("../../package.json").version);
+                    process.exit(0);
+                }
+                
                 argv = optimist
                     .usage("The Cloud9 CLI.\nUsage: c9 [--verbose] <command> [<args>]\n\n"
                             + "The most commonly used c9 commands are:\n"