diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg
index da2b0436..1ac5a66f 100644
--- a/buildbot/master/files/config/master.cfg
+++ b/buildbot/master/files/config/master.cfg
@@ -85,23 +85,29 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
 c['schedulers'].append(schedulers.ForceScheduler(
     name="force",
     builderNames=[
+        "android",
+        "android-nightly",
+        "arm32",
+        "arm64",
         "linux-dev",
-        "linux-rel",
         "linux-dev-yaml",
-        "mac-rel-wpt",
+        "linux-nightly",
+        "linux-rel",
         "mac-dev-unit",
+        "mac-nightly",
         "mac-rel-css",
-        "android",
-        "arm32",
-        "arm64",
-        "android-nightly",
+        "mac-rel-wpt",
         "windows",
     ],
 ))
 c['schedulers'].append(schedulers.Nightly(
     name="Nightly",
     branch="master",
-    builderNames=["android-nightly"],
+    builderNames=[
+        "android-nightly",
+        "linux-nightly",
+        "mac-nightly"
+    ],
     hour=1,
     minute=0,
 ))
diff --git a/buildbot/master/files/config/steps.yml b/buildbot/master/files/config/steps.yml
index 7668b3c2..d5b5f319 100644
--- a/buildbot/master/files/config/steps.yml
+++ b/buildbot/master/files/config/steps.yml
@@ -22,6 +22,11 @@ mac-rel-css:
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh
 
+mac-nightly:
+  - ./mach build --release
+  - ./mach package --release
+  - s3cmd put target/*.dmg s3://servo-developer-preview/nightly/mac/
+
 linux-dev:
   - ./mach test-tidy --no-progress --all
   - ./mach test-tidy --no-progress --self-test
@@ -45,6 +50,12 @@ linux-rel:
   - bash ./etc/ci/lockfile_changed.sh
   - bash ./etc/ci/manifest_changed.sh
 
+linux-nightly:
+  - ./mach build --release
+  - ./mach package --release
+  - s3cmd -c ~/.s3cfg-servo put target/release/*.tar.gz s3://servo-developer-preview/nightly/linux/
+  - rm -rf target/
+
 android:
   - ./mach build --android --dev
   - ./mach package --android --dev
@@ -55,7 +66,7 @@ android:
 android-nightly:
   - ./mach build --android --release
   - ./mach package --android --release
-  - s3cmd put target/arm-linux-androideabi/release/servo.apk s3://servo-rust/nightly/servo.apk
+  - s3cmd put target/arm-linux-androideabi/release/*.apk s3://servo-developer-preview/nightly/android/
 
 arm32:
   - ./mach build --rel --target=arm-unknown-linux-gnueabihf
diff --git a/nightly/files/s3cfg b/nightly/files/s3cfg
new file mode 100644
index 00000000..7878eea4
--- /dev/null
+++ b/nightly/files/s3cfg
@@ -0,0 +1,75 @@
+[default]
+access_key = {{ pillar['nightly']['aws_access_key_id'] }}
+access_token =
+add_encoding_exts =
+add_headers =
+bucket_location = us-west-2
+ca_certs_file =
+cache_file =
+check_ssl_certificate = True
+check_ssl_hostname = True
+cloudfront_host = cloudfront.amazonaws.com
+default_mime_type = binary/octet-stream
+delay_updates = False
+delete_after = False
+delete_after_fetch = False
+delete_removed = False
+dry_run = False
+enable_multipart = True
+encoding = UTF-8
+encrypt = False
+expiry_date =
+expiry_days =
+expiry_prefix =
+follow_symlinks = False
+force = False
+get_continue = False
+gpg_command = /usr/bin/gpg
+gpg_decrypt = %(gpg_command)s -d --verbose --no-use-agent --batch --yes
+--passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_encrypt = %(gpg_command)s -c --verbose --no-use-agent --batch --yes
+--passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_passphrase =
+guess_mime_type = True
+host_base = s3.amazonaws.com
+host_bucket = %(bucket)s.s3.amazonaws.com
+human_readable_sizes = False
+invalidate_default_index_on_cf = False
+invalidate_default_index_root_on_cf = True
+invalidate_on_cf = False
+kms_key =
+limitrate = 0
+list_md5 = False
+log_target_prefix =
+long_listing = False
+max_delete = -1
+mime_type =
+multipart_chunk_size_mb = 15
+multipart_max_chunks = 10000
+preserve_attrs = True
+progress_meter = True
+proxy_host =
+proxy_port = 0
+put_continue = False
+recursive = False
+recv_chunk = 65536
+reduced_redundancy = False
+requester_pays = False
+restore_days = 1
+secret_key = {{ pillar['nightly']['aws_secret_key'] }}
+send_chunk = 65536
+server_side_encryption = False
+signature_v2 = False
+simpledb_host = sdb.amazonaws.com
+skip_existing = False
+socket_timeout = 300
+stats = False
+stop_on_error = False
+storage_class =
+urlencoding_mode = normal
+use_https = True
+use_mime_magic = True
+verbosity = WARNING
+website_endpoint = http://%(bucket)s.s3-website-%(location)s.amazonaws.com/
+website_error =
+website_index = index.html
diff --git a/nightly/init.sls b/nightly/init.sls
new file mode 100644
index 00000000..1b9565f0
--- /dev/null
+++ b/nightly/init.sls
@@ -0,0 +1,14 @@
+/home/servo/.s3cfg:
+  file.managed:
+    - source: salt://{{ tpldir }}/files/s3cfg
+    - user: servo
+    - group: servo
+    - mode: 644
+
+
+s3cmd:
+  pip.installed:
+    - pkgs:
+      - s3cmd
+    - require:
+      - pkg: pip
diff --git a/top.sls b/top.sls
index 1c84eb05..194e901e 100644
--- a/top.sls
+++ b/top.sls
@@ -18,19 +18,21 @@ base:
 
   'servo-(mac|macpro)\d+':
     - match: pcre
-    - osx
     - buildbot.slave
+    - nightly
+    - osx
     - servo-build-dependencies
 
   'servo-linux\d+':
     - match: pcre
     - buildbot.slave
+    - nightly
     - servo-build-dependencies
     - xvfb
 
   'servo-master\d+':
     - match: pcre
-    - git
     - buildbot.master
+    - git
     - homu
     - nginx