diff --git a/build/package.json b/build/package.json
index de9053006..40e5b309a 100644
--- a/build/package.json
+++ b/build/package.json
@@ -8,6 +8,7 @@
   "dependencies": {
     "asar": "^0.8.0",
     "async": "~0.2.9",
+    "aws-sdk": "^2.2.18",
     "donna": "^1.0.13",
     "formidable": "~1.0.14",
     "fs-plus": "2.x",
diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee
index fc96121ae..4f8df6336 100644
--- a/build/tasks/publish-build-task.coffee
+++ b/build/tasks/publish-build-task.coffee
@@ -6,6 +6,7 @@ async = require 'async'
 fs = require 'fs-plus'
 GitHub = require 'github-releases'
 request = require 'request'
+AWS = require 'aws-sdk'
 
 grunt = null
 
@@ -210,7 +211,7 @@ deleteExistingAssets = (release, assetNames, callback) ->
   async.parallel(tasks, callback)
 
 uploadAssets = (release, buildDir, assets, callback) ->
-  upload = (release, assetName, assetPath, callback) ->
+  uploadToReleases = (release, assetName, assetPath, callback) ->
     options =
       uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
       method: 'POST'
@@ -221,15 +222,43 @@ uploadAssets = (release, buildDir, assets, callback) ->
 
     assetRequest = request options, (error, response, body='') ->
       if error? or response.statusCode >= 400
-        logError("Upload release asset #{assetName} failed", error, body)
+        logError("Upload release asset #{assetName} to Releases failed", error, body)
         callback(error ? new Error(response.statusCode))
       else
         callback(null, release)
 
     fs.createReadStream(assetPath).pipe(assetRequest)
 
+  uploadToS3 = (release, assetName, assetPath, callback) ->
+    s3Key = process.env.BUILD_ATOM_RELEASES_S3_KEY
+    s3Secret = process.env.BUILD_ATOM_RELEASES_S3_SECRET
+    s3Bucket = process.env.BUILD_ATOM_RELEASES_S3_BUCKET
+
+    unless s3Key and s3Secret and s3Bucket
+      callback(new Error('BUILD_ATOM_RELEASES_S3_KEY, BUILD_ATOM_RELEASES_S3_SECRET, and BUILD_ATOM_RELEASES_S3_BUCKET environment variables must be set.'))
+      return
+
+    s3Info =
+      accessKeyId: s3Key
+      secretAccessKey: s3Secret
+    s3 = new AWS.S3 s3Info
+
+    key = "releases/#{release.tag_name}/#{assetName}"
+    uploadParams =
+      Bucket: s3Bucket
+      ACL: 'public-read'
+      Key: key
+      Body: fs.createReadStream(assetPath)
+    s3.upload uploadParams, (error, data) ->
+      if error?
+        logError("Upload release asset #{assetName} to S3 failed", error)
+        callback(error)
+      else
+        callback(null, release)
+
   tasks = []
   for {assetName} in assets
     assetPath = path.join(buildDir, assetName)
-    tasks.push(upload.bind(this, release, assetName, assetPath))
+    tasks.push(uploadToReleases.bind(this, release, assetName, assetPath))
+    tasks.push(uploadToS3.bind(this, release, assetName, assetPath))
   async.parallel(tasks, callback)
diff --git a/script/cibuild b/script/cibuild
index b3f0b3f83..860e0a938 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -40,6 +40,10 @@ function setEnvironmentVariables() {
     process.env.CC = 'clang';
     process.env.CXX = 'clang++';
     process.env.npm_config_clang = '1';
+  } else if (process.platform === 'win32') {
+    process.env.BUILD_ATOM_RELEASES_S3_KEY = process.env.BUILD_ATOM_WIN_RELEASES_S3_KEY
+    process.env.BUILD_ATOM_RELEASES_S3_SECRET = process.env.BUILD_ATOM_WIN_RELEASES_S3_SECRET
+    process.env.BUILD_ATOM_RELEASES_S3_BUCKET = process.env.BUILD_ATOM_WIN_RELEASES_S3_BUCKET
   }
 }
 
diff --git a/script/cibuild-atom-linux b/script/cibuild-atom-linux
index c4e957189..2c3395608 100755
--- a/script/cibuild-atom-linux
+++ b/script/cibuild-atom-linux
@@ -3,6 +3,9 @@
 set -e
 
 export ATOM_ACCESS_TOKEN=$BUILD_ATOM_LINUX_ACCESS_TOKEN
+export BUILD_ATOM_RELEASES_S3_KEY=$BUILD_ATOM_LINUX_RELEASES_S3_KEY
+export BUILD_ATOM_RELEASES_S3_SECRET=$BUILD_ATOM_LINUX_RELEASES_S3_SECRET
+export BUILD_ATOM_RELEASES_S3_BUCKET=$BUILD_ATOM_LINUX_RELEASES_S3_BUCKET
 
 if [ -d /usr/local/share/nodenv ]; then
   export NODENV_ROOT=/usr/local/share/nodenv
diff --git a/script/cibuild-atom-rpm b/script/cibuild-atom-rpm
index a861a068b..2faa89347 100755
--- a/script/cibuild-atom-rpm
+++ b/script/cibuild-atom-rpm
@@ -8,5 +8,8 @@ docker run \
  --env JANKY_SHA1="$JANKY_SHA1" \
  --env JANKY_BRANCH="$JANKY_BRANCH" \
  --env ATOM_ACCESS_TOKEN="$BUILD_ATOM_RPM_ACCESS_TOKEN" \
+ --env BUILD_ATOM_RELEASES_S3_KEY="$BUILD_ATOM_RPM_RELEASES_S3_KEY" \
+ --env BUILD_ATOM_RELEASES_S3_SECRET="$BUILD_ATOM_RPM_RELEASES_S3_SECRET" \
+ --env BUILD_ATOM_RELEASES_S3_BUCKET="$BUILD_ATOM_RPM_RELEASES_S3_BUCKET" \
  atom-rpm /atom/script/rpmbuild
 docker rmi atom-rpm