diff --git a/.travis.yml b/.travis.yml
index d6eadafb39..2cdf93d6fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ env:
   global:
     - secure: "HU0QOLEDkYHcjX+PkicGGQ5g2L1/19V2fH13OSn82DOFlIiWmCfhSI8EG/QoWwPDp/HYQ4DH5Lo+ZEhVz5tgEultItyJ38LZJl/YYOzSAiRvTezmDdz+Cdg6SXAwCvgFCTagEJ1ChL5NyenDGDlwPB/drN0HlNNU6igPqNkM8l0="
     - secure: "VByzrX+inH3Z2nq50Hkj1FJnyOjPdsdIo/RUcl6DxUjkYfXP0n3tkPZGFA0PwiDpEwvRcSGLMR7mJ59Bhja5wgqXNhMqV4F0kB2PEFHSC3UmkyMnTSmDBKvP2aT6JLq00K3mYeNV5HiaYV4S7UVNdzZwaPCgc2aVZN8hF4f5/V8="
+    - secure: "P1Wp4HoI2O8o2PPAEe9Z23TrZMEn+lrCQdfQ2llyXmLYJaM+lLsE6qsQp6gMaLcl17YFm75MTKJgp22kDdVpOM1nX3xz2leZ2AWiJ61IBZ+0+f3Xubogp7SaNzlJN7zTzh2WTSWJ0Nng3X1R9JlqMbio2LPRoaA/xPMwuNv91Fw="
 after_success:
   - mvn clean test jacoco:report coveralls:report
-  - mvn clean deploy --settings .travis.mvn.settings.xml
\ No newline at end of file
+  - mvn clean deploy --settings .travis/maven-settings.xml
+  - mvn javadoc:javadoc
+  - .travis/deploy-javadoc-latest.sh
\ No newline at end of file
diff --git a/.travis/deploy-javadoc-latest.sh b/.travis/deploy-javadoc-latest.sh
new file mode 100755
index 0000000000..692f2263e0
--- /dev/null
+++ b/.travis/deploy-javadoc-latest.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ "$TRAVIS_REPO_SLUG" == "javaslang/javaslang" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+
+  echo -e "Publishing javadoc...\n"
+
+  cp -R target/site/apidocs $HOME/javadoc-latest
+
+  cd $HOME
+  git config --global user.email "travis@travis-ci.org"
+  git config --global user.name "travis-ci"
+  git clone https://${GH_TOKEN}@github.com/javaslang/javaslang.github.io
+
+  cd javaslang.github.io
+  git rm -rf ./javadoc/latest
+  cp -Rf $HOME/javadoc-latest ./javadoc/latest
+  git add -f .
+  git commit -m "Lastest javadoc on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to gh-pages"
+  git push origin master
+
+  echo -e "Published Javadoc to gh-pages.\n"
+  
+fi
diff --git a/.travis.mvn.settings.xml b/.travis/maven-settings.xml
similarity index 100%
rename from .travis.mvn.settings.xml
rename to .travis/maven-settings.xml