diff --git a/.travis.yml b/.travis.yml
index cfdb6f01..c8942e2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,17 @@ env:
   - EMULATOR=sims BASICS=yes
 install: sh -ex build/dependencies.sh install_${TRAVIS_OS_NAME:-linux}
 script: make
+deploy:
+  provider: s3
+  access_key_id: "$AWS_ID"
+  secret_access_key: "$AWS_SECRET"
+  bucket: "$S3_BUCKET"
+  skip_cleanup: true
+  local_dir: out
+  acl: public_read
+  on:
+    branch: master
+after_deploy:
+  - build/deploy.sh
 notifications:
   email: lars@nocrew.org
diff --git a/build/deploy.sh b/build/deploy.sh
new file mode 100755
index 00000000..71f52a29
--- /dev/null
+++ b/build/deploy.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Here we can do anything when deployment has finished."
+echo "Such as kicking off a second build stage."
+exit 0