diff --git a/.travis/build-deploy.sh b/.travis/build-deploy.sh
index 4405fa145b..17e22e0c26 100755
--- a/.travis/build-deploy.sh
+++ b/.travis/build-deploy.sh
@@ -11,7 +11,7 @@ function push_docs() {
 
         if [ "$TRAVIS_BRANCH" == "master" ]; then
             git config user.name "Travis CI (pmd-bot)"
-            git config user.email "adangel+pmd-bot@users.sourceforge.net"
+            git config user.email "andreas.dangel+pmd-bot@adangel.org"
             git add -A docs
             git commit -m "Update documentation"
             git push git@github.com:pmd/pmd.git HEAD:master
diff --git a/.travis/release.sh b/.travis/release.sh
index 56746a21e3..bede0b29ea 100755
--- a/.travis/release.sh
+++ b/.travis/release.sh
@@ -55,8 +55,8 @@ mkdir pmd.github.io
 (
     cd pmd.github.io
     git init
-    git config user.email "adangel+pmd-bot@users.sourceforge.net"
-    git config user.name "Andreas Dangel (PMD Releases)"
+    git config user.name "Travis CI (pmd-bot)"
+    git config user.email "andreas.dangel+pmd-bot@adangel.org"
     git config core.sparsecheckout true
     git remote add origin git@github.com:pmd/pmd.github.io.git
     echo "latest/" > .git/info/sparse-checkout