diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6997187ad25e2cab009d50db09cc1f7c2c4c49d6..411d932529af2b8ac7b3c2175dad8fbd9b2caac1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,3 +34,13 @@ Python 3.5 POCL:
   - pocl
   except:
   - tags
+
+Documentation:
+  script:
+  - EXTRA_INSTALL="numpy mako"
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
+  - ". ./build-docs.sh"
+  tags:
+  - python3.5
+  only:
+  - master
diff --git a/doc/upload-docs.sh b/doc/upload-docs.sh
index bd5d48a365aba4de791742cc38fb54640057d5e2..dc5a9bf9b31e3ad1e648a5b4c68d001a8e1cc1a5 100755
--- a/doc/upload-docs.sh
+++ b/doc/upload-docs.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-rsync --progress --verbose --archive --delete _build/html/* doc-upload:doc/boxtree
+rsync --verbose --archive --delete _build/html/* doc-upload:doc/boxtree