diff --git a/atom/browser/api/lib/auto-updater.coffee b/atom/browser/api/lib/auto-updater.coffee
index 7e3fa99a76d9..41b78a00d7e0 100644
--- a/atom/browser/api/lib/auto-updater.coffee
+++ b/atom/browser/api/lib/auto-updater.coffee
@@ -1,25 +1,7 @@
-if process.platform is 'win32'
-  module.exports = require './auto-updater/auto-updater-win'
-  return
-
-# Implementation on OS X.
-autoUpdater  = process.atomBinding('auto_updater').autoUpdater
-EventEmitter = require('events').EventEmitter
-
-autoUpdater.__proto__ = EventEmitter.prototype
-
-autoUpdater.quitAndInstall = ->
-  # If we don't have any window then quitAndInstall immediately.
-  BrowserWindow = require 'browser-window'
-  windows = BrowserWindow.getAllWindows()
-  if windows.length is 0
-    @_quitAndInstall()
-    return
-
-  # Do the restart after all windows have been closed.
-  app = require 'app'
-  app.removeAllListeners 'window-all-closed'
-  app.once 'window-all-closed', @_quitAndInstall.bind(this)
-  win.close() for win in windows
-
-module.exports = autoUpdater
+switch process.platform
+  when 'win32'
+    module.exports = require './auto-updater/auto-updater-win'
+  when 'darwin'
+    module.exports = require './auto-updater/auto-updater-mac'
+  else
+    throw new Error('auto-updater is not implemented on this platform')
diff --git a/atom/browser/api/lib/auto-updater/auto-updater-mac.coffee b/atom/browser/api/lib/auto-updater/auto-updater-mac.coffee
new file mode 100644
index 000000000000..9ec9f3f91749
--- /dev/null
+++ b/atom/browser/api/lib/auto-updater/auto-updater-mac.coffee
@@ -0,0 +1,20 @@
+{EventEmitter} = require 'events'
+{autoUpdater} = process.atomBinding 'auto_updater'
+
+autoUpdater.__proto__ = EventEmitter.prototype
+
+autoUpdater.quitAndInstall = ->
+  # If we don't have any window then quitAndInstall immediately.
+  BrowserWindow = require 'browser-window'
+  windows = BrowserWindow.getAllWindows()
+  if windows.length is 0
+    @_quitAndInstall()
+    return
+
+  # Do the restart after all windows have been closed.
+  app = require 'app'
+  app.removeAllListeners 'window-all-closed'
+  app.once 'window-all-closed', @_quitAndInstall.bind(this)
+  win.close() for win in windows
+
+module.exports = autoUpdater
diff --git a/filenames.gypi b/filenames.gypi
index 389c245ffa8a..f6a7dbd08680 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -11,6 +11,7 @@
       'atom/browser/api/lib/app.coffee',
       'atom/browser/api/lib/atom-delegate.coffee',
       'atom/browser/api/lib/auto-updater.coffee',
+      'atom/browser/api/lib/auto-updater/auto-updater-mac.coffee',
       'atom/browser/api/lib/auto-updater/auto-updater-win.coffee',
       'atom/browser/api/lib/auto-updater/squirrel-update-win.coffee',
       'atom/browser/api/lib/browser-window.coffee',