diff --git a/.shippable.yml b/.shippable.yml
index 499b2c14234..199a7792e92 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -42,6 +42,10 @@ build:
             echo "- Building Documentation";
             echo "Commit range:" ${COMMIT_RANGE}
             make htmldocs
+            if [ "$?" != "0" ]; then
+              echo "Documentation build failed";
+              exit 1;
+            fi
             if [ -s doc/doc.warnings ]; then
               echo " => New documentation warnings/errors";
               cp doc/doc.warnings doc.warnings
diff --git a/doc/Makefile b/doc/Makefile
index 05170252a94..52148a81ce9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -73,7 +73,7 @@ content: scripts/extract_content.py
 	$(Q)$<
 
 kconfig: scripts/genrest/genrest.py
-	$(Q)srctree=../ KERNELVERSION=1.9.99 SRCARCH=x86 python3 $< ../Kconfig reference/kconfig/
+	$(Q)srctree=../ ENV_VAR_BOARD_DIR=boards/*/*/ ENV_VAR_ARCH=* KERNELVERSION=1.9.99 SRCARCH=x86 python3 $< ../Kconfig reference/kconfig/
 
 
 prep: doxy content kconfig