diff --git a/DoKernelOrg b/DoKernelOrg
index a03a891621..3fbfe5e064 100755
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -17,6 +17,12 @@ make clean >/dev/null 2>&1 &&
 git checkout master &&
 make clean >/dev/null 2>&1 &&
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+	ASCIIDOC8=YesPlease
+	export ASCIIDOC8 ;;
+esac
+
 case "$1" in
 '')
 	echo "* Building all"
diff --git a/Make b/Make
index 0d3779f434..39642fd3bf 100755
--- a/Make
+++ b/Make
@@ -81,6 +81,12 @@ sh -c 'git describe --abbrev=4 HEAD' >/dev/null 2>&1 || {
 	$GIT describe --abbrev=4 HEAD | sed -e 's/-/./g' >version
 }
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+	ASCIIDOC8=YesPlease
+	export ASCIIDOC8 ;;
+esac
+
 CFLAGS="$O $Wall -Wdeclaration-after-statement -g"
 
 make $d \
diff --git a/dodoc.sh b/dodoc.sh
index 20c0c933f8..5cbc2696b7 100755
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -71,6 +71,12 @@ do
 	rm -fr doc-$type-inst
 done
 
+case "$(asciidoc --version 2>&1)" in
+asciidoc' 8'.*)
+	ASCIIDOC8=YesPlease
+	export ASCIIDOC8 ;;
+esac
+
 make >./:html.log 2>&1 \
 	-C Documentation -j 2 \
 	WEBDOC_DEST="$DOCREPO/doc-html-inst" install-webdoc || exit