diff --git a/Make b/Make
index e635b104e7..7d6907b145 100755
--- a/Make
+++ b/Make
@@ -234,9 +234,8 @@ then
 fi
 
 set	MAN_BASE_URL='"http://www.kernel.org/pub/software/scm/git/docs/"' \
-	MAN_BOLD_LITERAL=YesPlease \
 	$SHA1IMPLEMENTATION \
-	GNU_ROFF=YesPlease \
+	USE_ASCIIDOCTOR=YesPlease \
 	USE_LIBPCRE=YesPlease \
 	"$@"
 
diff --git a/RelBuild b/RelBuild
index ab49d53f9f..45045b67e4 100755
--- a/RelBuild
+++ b/RelBuild
@@ -11,8 +11,7 @@ make clean &&
 make $j CFLAGS="-O2 -Wno-format-zero-length" \
 	TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" dist &&
 
-ASCIIDOC_NO_ROFF=YesPlease \
-ASCIIDOC8=YesPlease \
+USE_ASCIIDOCTOR=YesPlease \
 MAN_BASE_URL="git-htmldocs/" \
 make $j \
 	TAR_DIST_EXTRA_OPTS="$TAR_DIST_EXTRA_OPTS" \
diff --git a/dodoc.sh b/dodoc.sh
index 719203f482..2a72b654f9 100755
--- a/dodoc.sh
+++ b/dodoc.sh
@@ -64,8 +64,7 @@ done
 dd='
 	MAN_BASE_URL="git-htmldocs/"
 	BLK_SHA1=YesPlease
-	GNU_ROFF=YesPlease
-	MAN_BOLD_LITERAL=YesPlease
+	USE_ASCIIDOCTOR=YesPlease
 '
 
 if test -z "$DOC_FROM_SCRATCH"