diff --git a/tasks/update-atom-shell-task.coffee b/tasks/update-atom-shell-task.coffee
index 8a4eda03e..006001e50 100644
--- a/tasks/update-atom-shell-task.coffee
+++ b/tasks/update-atom-shell-task.coffee
@@ -6,6 +6,46 @@ request = require 'request'
 module.exports = (grunt) ->
   {spawn, mkdir, rm, cp} = require('./task-helpers')(grunt)
 
+  accessToken = null
+  getTokenFromKeychain = ->
+    accessToken ?= process.env['ATOM_ACCESS_TOKEN']
+
+  callAtomShellReposApi = (path, callback) ->
+    options =
+      url: "https://api.github.com/repos/atom/atom-shell#{path}"
+      proxy: process.env.http_proxy || process.env.https_proxy
+      headers:
+        authorization: "token #{getTokenFromKeychain()}"
+        accept: 'application/vnd.github.manifold-preview'
+    request options, (error, response, body) ->
+      body = JSON.parse(body) if not error?
+      callback(error, response, body)
+
+  findReleaseIdFromAtomShellVersion = (version, callback) ->
+    callAtomShellReposApi '/releases', (error, response, data) ->
+      if error?
+        grunt.log.error('Cannot get releases of atom-shell')
+        callback(error)
+      else
+        for release in data when release.tag_name is version
+          callback(null, release.id)
+          return
+        grunt.log.error("There is no #{version} release of atom-shell")
+        callback(false)
+
+  getAtomShellDownloadUrl = (version, releaseId, callback) ->
+    callAtomShellReposApi "/releases/#{releaseId}/assets", (error, response, data) ->
+      if error?
+        grunt.log.error("Cannot get assets of atom-shell's #{version} release")
+        callback(error)
+      else
+        filename = "atom-shell-#{version}-#{process.platform}.zip"
+        for asset in data when asset.name is filename and asset.state is 'uploaded'
+          callback(null, asset.url)
+          return
+        grunt.log.error("Cannot get url of atom-shell's release asset")
+        callback(false)
+
   getAtomShellVersion = ->
     versionPath = path.join('atom-shell', 'version')
     if grunt.file.isFile(versionPath)
@@ -18,14 +58,25 @@ module.exports = (grunt) ->
   isAtomShellVersionCached = (version) ->
     grunt.file.isFile(getCachePath(version), 'version')
 
-  downloadAtomShell = (version, callback) ->
+  downloadAtomShell = (version, url, callback) ->
     options =
-      url: "https://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/#{version}/atom-shell-#{version}-darwin.zip"
+      url: url
+      followRedirect: false
       proxy: process.env.http_proxy || process.env.https_proxy
 
+    # Only set headers for GitHub host, the url could also be a S3 link and
+    # setting headers for it would make the request fail.
+    if require('url').parse(url).hostname is 'api.github.com'
+      options.headers =
+        authorization: "token #{getTokenFromKeychain()}"
+        accept: 'application/octet-stream'
+
     inputStream = request(options)
     inputStream.on 'response', (response) ->
-      if response.statusCode is 200
+      if response.statusCode is 302
+        # Manually handle redirection so headers would not be sent for S3.
+        downloadAtomShell(version, response.headers.location, callback)
+      else if response.statusCode is 200
         grunt.log.writeln("Downloading atom-shell version #{version.cyan}")
         cacheDirectory = getCachePath(version)
         rm(cacheDirectory)
@@ -41,6 +92,17 @@ module.exports = (grunt) ->
           grunt.log.error("atom-shell #{version.cyan} request failed")
         callback(false)
 
+  downloadAtomShellOfVersion = (version, callback) ->
+    findReleaseIdFromAtomShellVersion version, (error, releaseId) ->
+      if error?
+        callback(error)
+      else
+        getAtomShellDownloadUrl version, releaseId, (error, url) ->
+          if error?
+            callback(error)
+          else
+            downloadAtomShell version, url, callback
+
   unzipAtomShell = (zipPath, callback) ->
     grunt.log.writeln('Unzipping atom-shell')
     directoryPath = path.dirname(zipPath)
@@ -74,7 +136,7 @@ module.exports = (grunt) ->
           installAtomShell(atomShellVersion)
           rebuildNativeModules(currentAtomShellVersion, done)
         else
-          downloadAtomShell atomShellVersion, (error, zipPath) ->
+          downloadAtomShellOfVersion atomShellVersion, (error, zipPath) ->
             if zipPath?
               unzipAtomShell zipPath, (error) ->
                 if error?