diff --git a/.travis.yml b/.travis.yml
index 938b01f5..6e206c80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,20 @@
 language: c
 os:
- - osx
  - linux
+ - osx
 compiler:
   - gcc
   - clang
 env:
   - WREN_OPTIONS="" CI_ARCHS="ci_32 ci_64"
   - WREN_OPTIONS="-DWREN_NAN_TAGGING=0" CI_ARCHS="ci_64"
+
+jobs:
+  include:
+    - stage: deploy
+      script: bash util/deployGHP.sh
+      if: branch = master AND NOT type IN (pull_request)
+
 # Travis VMs are 64-bit but we compile both for 32 and 64 bit. To enable the
 # 32-bit builds to work, we need gcc-multilib.
 addons:
@@ -15,5 +22,8 @@ addons:
     packages:
     - gcc-multilib
     - g++-multilib
+    - python3-markdown
+    - ruby-sass
+
 sudo: false # Enable container-based builds.
 script: make WREN_CFLAGS=${WREN_OPTIONS} ${CI_ARCHS}
diff --git a/Makefile b/Makefile
index f952c283..21791bdc 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ benchmark: release
 
 # Generate the Wren site.
 docs:
+	mkdir -p build
 	$(V) ./util/generate_docs.py
 
 # Continuously generate and serve the Wren site.
diff --git a/util/deployGHP.sh b/util/deployGHP.sh
new file mode 100644
index 00000000..54ecb01a
--- /dev/null
+++ b/util/deployGHP.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+make gh-pages
+
+git clone https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} gh-pages-repo
+cd gh-pages-repo
+git checkout gh-pages
+
+rm -rf *
+cp -r ../build/gh-pages/* .
+
+git status
+ls 
+
+if ! $( git diff-index --quiet HEAD ) ; then
+	git config user.name "Travis CI"
+	git config user.email "$COMMIT_AUTHOR_EMAIL"
+	git add -A .
+	git commit -m "Deploy to GitHub Pages: ${SHA}"
+	git push 
+fi