diff --git a/.travis.yml b/.travis.yml
index afbbe6c82..ebd2e2206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,17 @@ language: python
 sudo: required
 dist: trusty
 
+deploy:
+  provider: pages
+  local_dir: ${TRAVIS_BUILD_DIR}/docs/build/html
+  skip_cleanup: true
+  repo: qmlcode/qmlcode.github.io
+  target_branch: master
+  github_token: ${GH_TOKEN} # Set in travis-ci.org dashboard
+  on:
+    branch: master
+    condition: ${TRAVIS_PYTHON_VERSION} = "2.7"
+
 python:
   - "2.7"
   - "3.4"
@@ -15,15 +26,23 @@ before_install:
 install:
  - sudo apt-get install -qq gcc gfortran libblas-dev liblapack-dev
  - sudo apt-get install -qq gcc-4.8 gfortran-4.8
-
  - |
    if [ ${TRAVIS_PYTHON_VERSION:0:1} = 3 ]; then
        sudo apt-get install python3-numpy
+       python3 setup.py build
        python3 setup.py install
+       pip3 install sphinx
+       pip3 install sphinx-rtd-theme
+       cd ${TRAVIS_BUILD_DIR}/docs
+       make html
    elif [ ${TRAVIS_PYTHON_VERSION} = "2.7" ]; then
        sudo apt-get install python-numpy
+       python2 setup.py build
        python2 setup.py install
-
+       pip2 install sphinx
+       pip2 install sphinx-rtd-theme
+       cd ${TRAVIS_BUILD_DIR}/docs
+       make html
    else
        echo "ERROR: Unknown Python version."
    fi
@@ -34,3 +53,6 @@ before_script:
 
 script:
  - nosetests -v
+
+notifications:
+  email: false
diff --git a/docs/build/html/.nojekyll b/docs/build/html/.nojekyll
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/source/index.rst b/docs/source/index.rst
index f2f262ec3..630d2f4fd 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -20,7 +20,7 @@ Current list of contributors:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 -  Anders S. Christensen (University of Basel)
--  Felix Faber (University of Basel)
+-  Felix A. Faber (University of Basel)
 -  Bing Huang (University of Basel)
 -  Lars A. Bratholm (University of Copenhagen)
 -  Alexandre Tkatchenko (University of Luxembourg)