diff --git a/Tools/scripts/build_autotest.sh b/Tools/scripts/build_autotest.sh
index d475c58e31..bbfc405429 100755
--- a/Tools/scripts/build_autotest.sh
+++ b/Tools/scripts/build_autotest.sh
@@ -125,6 +125,8 @@ echo $githash > "buildlogs/history/$hdate/githash.txt"
 
 (cd APM && Tools/scripts/build_parameters.sh)
 
+(cd APM && Tools/scripts/build_docs.sh)
+
 timelimit 5200 APM/Tools/autotest/autotest.py --timeout=5000 > buildlogs/autotest-output.txt 2>&1
 
 ) >> build.log 2>&1
diff --git a/Tools/scripts/build_docs.sh b/Tools/scripts/build_docs.sh
new file mode 100755
index 0000000000..72e0502ac2
--- /dev/null
+++ b/Tools/scripts/build_docs.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# work from either APM directory or above
+[ -d ArduPlane ] || cd APM
+
+export DOCS_OUTPUT_BASE=../buildlogs/docs
+
+(
+./docs/build-libs.sh
+./docs/build-arduplane.sh
+./docs/build-arducopter.sh
+./docs/build-apmrover2.sh
+) > ../buildlogs/build_docs.log 2>&1