diff --git a/.travis.yml b/.travis.yml
index b93c9a850..9373d8597 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,39 @@
 branches:
   except:
-    - /^v\d\.\d\.\d.*$/
-    
+  - /^v\d\.\d\.\d.*$/
+  
 env:
   REPO: $TRAVIS_REPO_SLUG
   VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER
-
+  
 sudo: required
 
 services:
-  - docker
+- docker
+
+before_install:
+- openssl aes-256-cbc -K $encrypted_27087ae1f4db_key -iv $encrypted_27087ae1f4db_iv -in .travis/traefik.id_rsa.enc -out ~/.ssh/traefik.id_rsa -d
+- eval "$(ssh-agent -s)"
+- chmod 600 ~/.ssh/traefik.id_rsa
+- ssh-add ~/.ssh/traefik.id_rsa
 
 install:
-  - sudo service docker stop
-  - sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker
-  - sudo chmod +x /usr/bin/docker
-  - sudo service docker start
+- sudo service docker stop
+- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker
+- sudo chmod +x /usr/bin/docker
+- sudo service docker start
+- pip install --user mkdocs
+- pip install --user pymdown-extensions
 
 before_script:
-  - make validate
-  - make binary
+- make validate
+- make binary
 
 script:
-  - make test-unit
-  - make test-integration
-  - make crossbinary
-  - make image
+- make test-unit
+- make test-integration
+- make crossbinary
+- make image
 
 after_success:
- - make deploy
+- make deploy
\ No newline at end of file
diff --git a/.travis/traefik.id_rsa.enc b/.travis/traefik.id_rsa.enc
new file mode 100644
index 000000000..bb347b95d
Binary files /dev/null and b/.travis/traefik.id_rsa.enc differ
diff --git a/script/deploy.sh b/script/deploy.sh
index 1c9b60a1d..c4b5b8285 100755
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -16,16 +16,19 @@ sudo chmod +x /usr/bin/ghr
 # github release and tag
 ghr -t $GITHUB_TOKEN -u containous -r traefik --prerelease ${VERSION} dist/
 
+# update docs.traefik.io
+mkdocs gh-deploy --clean
+
 # update traefik-library-image repo (official Docker image)
 git config --global user.email "emile@vauge.com"
 git config --global user.name "Emile Vauge"
-git clone https://github.com/containous/traefik-library-image.git
+git clone git@github.com:containous/traefik-library-image.git
 cd traefik-library-image
 ./update.sh $VERSION
 git add -A
 echo $VERSION | git commit --file -
 echo $VERSION | git tag -a $VERSION --file -
-git push -q --follow-tags https://emilevauge:${GITHUB_TOKEN}@github.com/containous/traefik-library-image.git
+git push -q --follow-tags -u origin master
 
 # create docker image emilevauge/traefik (compatibility)
 docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS