diff --git a/.travis.yml b/.travis.yml
index dc538b72ae..bf6ad2104a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ script:
  - make all
  - make test
 
+# Automatically update the trait documentation and Lua API
+after_success:
+ - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && make docs && cd packaging && ./update-wiki.sh
+
 # Only watch the development branch and tagged release.
 branches:
  only:
diff --git a/packaging/update-wiki.sh b/packaging/update-wiki.sh
index 2c281f2d1e..82b5b9d25a 100755
--- a/packaging/update-wiki.sh
+++ b/packaging/update-wiki.sh
@@ -1,17 +1,18 @@
-git config --global user.email "travis@travis-ci.org"
-git config --global user.name "travis-ci"
+#!/bin/bash
+
+git config --global user.email "orabot@users.noreply.github.com"
+git config --global user.name "orabot"
 
 echo "Updating https://github.com/OpenRA/OpenRA/wiki/Traits"
-rm -rf openra-wiki
-git clone git@github.com:OpenRA/OpenRA.wiki.git openra-wiki
-cp -fr ../DOCUMENTATION.md openra-wiki/Traits.md
+rm -rf $HOME/openra-wiki
+git clone git@github.com:OpenRA/OpenRA.wiki.git $HOME/openra-wiki
+cp -fr ../DOCUMENTATION.md $HOME/openra-wiki/Traits.md
 
 pushd .. &> /dev/null
-# d2k depends on all mod libraries
-mono --debug OpenRA.Utility.exe --lua-docs d2k > packaging/openra-wiki/New-Lua-API.md
+mono --debug OpenRA.Utility.exe --lua-docs d2k > $HOME/openra-wiki/New-Lua-API.md
 popd &> /dev/null
 
-pushd openra-wiki
+pushd $HOME/openra-wiki
 git add Traits.md
 git add New-Lua-API.md
 git commit -m "Update trait and scripting documentation"