diff --git a/README.md b/README.md
index 7dec14f..98d0b76 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The eventual goal is that libevdev wraps all ioctls available to evdev
 devices, thus making direct access unnecessary.
 
 Go here for the API documentation:
-http://whot.github.io/libevdev/
+http://www.freedesktop.org/software/libevdev/doc/latest/
 
 File bugs in the freedesktop.org bugzilla:
 https://bugs.freedesktop.org/enter_bug.cgi?product=libevdev
diff --git a/tools/publish-doc b/tools/publish-doc
index 66777ab..2dcd45e 100755
--- a/tools/publish-doc
+++ b/tools/publish-doc
@@ -1,11 +1,7 @@
 #!/bin/bash
 
-git checkout master
+set -e
+
 make
-mv doc/html doc/publish
-git checkout gh-pages
-rm -rf doc/html
-mv doc/publish doc/html
-git add doc/html
-git commit -asm "Documentation update for `git log -n 1 --format="format:%h" master`"
-git checkout master
+rsync --delete -avz doc/html/ freedesktop.org:/srv/www.freedesktop.org/www/software/libevdev/doc/latest
+