diff --git a/.travis.yml b/.travis.yml
index dd046dfe2f..65df1a87b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,11 @@
 language: node_js
 node_js:
 - stable
+script: npm run test && npm run build
+deploy:
+  provider: script
+  script: ci/deploy_from_travis.sh
+  skip_cleanup: true
+  on:
+        branch: master
+
diff --git a/ci/deploy_from_travis.sh b/ci/deploy_from_travis.sh
new file mode 100755
index 0000000000..b64364610e
--- /dev/null
+++ b/ci/deploy_from_travis.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+SHA=`git rev-parse --verify HEAD`
+
+git config user.name "Travis CI"
+git config user.email "builds@ethereum.org"
+git checkout --orphan gh-pages
+git rm --cached -r .
+echo "# Automatic build" > README.md
+echo "Built website from {$SHA}. See https://github.com/ethereum/remix/ for details." >> README.md
+# -f is needed because "build" is part of .gitignore
+git add -f README.md index.html build/app.js
+git commit -m "Built website from {$SHA}."
+
+ENCRYPTION_LABEL=fade88419824
+ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
+ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
+ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
+ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
+openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ci/deploy_key.enc -out deploy_key -d
+chmod 600 deploy_key
+eval `ssh-agent -s`
+ssh-add deploy_key
+
+git push -f git@github.com:ethereum/remix.git gh-pages
diff --git a/ci/travis_deploy.enc b/ci/travis_deploy.enc
new file mode 100644
index 0000000000..99ddf96eee
Binary files /dev/null and b/ci/travis_deploy.enc differ