diff --git a/atom/browser/lib/init.js b/atom/browser/lib/init.js
index 272cebbf875..df0f1b6685a 100644
--- a/atom/browser/lib/init.js
+++ b/atom/browser/lib/init.js
@@ -132,6 +132,19 @@ if (packageJson.desktopName != null) {
 // Chrome 42 disables NPAPI plugins by default, reenable them here
 app.commandLine.appendSwitch('enable-npapi');
 
+// Add othercommand line switches
+if (packageJson.commandLineSwitches) {
+  for (let i = 0; i < packageJson.commandLineSwitches.length; ++i) {
+    const option = packageJson.commandLineSwitches[i];
+
+    if (typeof option === 'string') {
+      app.commandLine.appendSwitch(option);
+    } else {
+      app.commandLine.appendSwitch(option[0], option[1]);
+    }
+  }
+}
+
 // Set the user path according to application's name.
 app.setPath('userData', path.join(app.getPath('appData'), app.getName()));