diff --git a/build/build.xml b/build/build.xml
index 0463f5d5a8..258e97474a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -128,13 +128,13 @@
 	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
 		<exec dir="."
-			command="phpBB/vendor/bin/sami.php update build/sami-checkout.conf.php"
+			command="php doctum.phar update build/doctum-checkout.conf.php"
 			passthru="true" />
 	</target>
 	<!-- Builds docs for multiple branches/tags into build/api/output/$branch -->
 	<target name="docs-all">
 		<exec dir="."
-			command="phpBB/vendor/bin/sami.php update build/sami-all.conf.php"
+			command="php doctum.phar update build/doctum-all.conf.php"
 			passthru="true" />
 	</target>
 
diff --git a/travis/check-doctum-parse-errors.sh b/travis/check-doctum-parse-errors.sh
index 4a7ac50157..45f62dc096 100755
--- a/travis/check-doctum-parse-errors.sh
+++ b/travis/check-doctum-parse-errors.sh
@@ -16,6 +16,17 @@ NOTESTS=$3
 
 if [ "$NOTESTS" == '1' ]
 then
-	(cd phpBB/vendor/bin/ && curl -O https://doctum.long-term.support/releases/latest/doctum.phar && chmod +x doctum.phar)
-	php phpBB/vendor/bin/doctum.phar parse build/doctum-checkout.conf.php -v
+	if [ ! -f doctum.phar ]; then
+		# Download the latest release
+		curl -O https://doctum.long-term.support/releases/5.1/doctum.phar
+		rm -f doctum.phar.sha256
+		curl -O https://doctum.long-term.support/releases/5.1/doctum.phar.sha256
+		sha256sum --strict --check doctum.phar.sha256
+		rm -f doctum.phar.sha256
+		# You can fetch the latest (5.1.x) version code here:
+		# https://doctum.long-term.support/releases/5.1/VERSION
+	fi
+	# Show the version to inform users of the script
+	php doctum.phar --version
+	php doctum.phar parse build/doctum-checkout.conf.php -v
 fi