diff --git a/bin/uglifyjs b/bin/uglifyjs
index fc33f96f..bade20cc 100755
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -5,12 +5,12 @@
 
 var UglifyJS = require("../tools/node");
 var sys = require("util");
-var optimist = require("optimist");
+var yargs = require("yargs");
 var fs = require("fs");
 var path = require("path");
 var async = require("async");
 var acorn;
-var ARGS = optimist
+var ARGS = yargs
     .usage("$0 input1.js [input2.js ...] [options]\n\
 Use a single dash to read input from the standard input.\
 \n\n\
@@ -129,7 +129,7 @@ if (ARGS.ast_help) {
 }
 
 if (ARGS.h || ARGS.help) {
-    sys.puts(optimist.help());
+    sys.puts(yargs.help());
     process.exit(0);
 }
 
diff --git a/package.json b/package.json
index 9d1ee87a..8e066602 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "dependencies": {
         "async"      : "~0.2.6",
         "source-map" : "0.1.34",
-        "optimist": "~0.3.5",
+        "yargs": "~1.3.3",
         "uglify-to-browserify": "~1.0.0"
     },
     "devDependencies": {