diff --git a/bin/handlebars b/bin/handlebars
index 7645adf36..deb809b13 100755
--- a/bin/handlebars
+++ b/bin/handlebars
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var optimist = require('optimist')
+var yargs = require('yargs')
     .usage('Precompile handlebar templates.\nUsage: $0 [template|directory]...', {
       'f': {
         'type': 'string',
@@ -110,7 +110,7 @@ var optimist = require('optimist')
     });
 
 
-var argv = optimist.argv;
+var argv = yargs.argv;
 argv.files = argv._;
 delete argv._;
 
@@ -121,7 +121,7 @@ Precompiler.loadTemplates(argv, function(err, opts) {
   }
 
   if (opts.help || (!opts.templates.length && !opts.version)) {
-    optimist.showHelp();
+    yargs.showHelp();
   } else {
     Precompiler.cli(opts);
   }
diff --git a/package.json b/package.json
index 6957dabdc..9d37d8a3e 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
   },
   "dependencies": {
     "async": "^1.4.0",
-    "optimist": "^0.6.1",
-    "source-map": "^0.4.4"
+    "source-map": "^0.4.4",
+    "yargs": "^3.32.0"
   },
   "optionalDependencies": {
     "uglify-js": "^2.6"