diff --git a/package.json b/package.json
index fe27e5181..b2da54fc2 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "normalize-package-data": "^2.0.0",
     "nslog": "^2.0.0",
     "oniguruma": "^4.1",
-    "optimist": "0.4.0",
     "pathwatcher": "^4.4",
     "property-accessors": "^1.1.3",
     "q": "^1.1.2",
@@ -68,7 +67,8 @@
     "text-buffer": "6.0.1",
     "theorist": "^1.0.2",
     "typescript-simple": "1.0.0",
-    "underscore-plus": "^1.6.6"
+    "underscore-plus": "^1.6.6",
+    "yargs": "^3.7.2"
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.27.0",
diff --git a/src/browser/main.coffee b/src/browser/main.coffee
index 746055ea4..1af0526dd 100644
--- a/src/browser/main.coffee
+++ b/src/browser/main.coffee
@@ -4,7 +4,7 @@ crashReporter = require 'crash-reporter'
 app = require 'app'
 fs = require 'fs-plus'
 path = require 'path'
-optimist = require 'optimist'
+yargs = require 'yargs'
 nslog = require 'nslog'
 
 console.log = nslog
@@ -85,7 +85,7 @@ setupCoffeeCache = ->
 
 parseCommandLine = ->
   version = app.getVersion()
-  options = optimist(process.argv[1..])
+  options = yargs(process.argv[1..]).wrap(100)
   options.usage """
     Atom Editor v#{version}