diff --git a/Documentation/Makefile b/Documentation/Makefile
index 16bbf15313d..d9db5e3e885 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -24,8 +24,8 @@
 # You can set these variables from the command line, and also
 # from the environment for the first two.
 # Ignore the _tags directory as per sphinx-tags docs to avoid infinite loop
-SPHINXOPTS      ?= -j 1 -W -A nuttx_versions="latest,${NUTTX_VERSIONS}"
-SPHINXAUTOOPTS  ?= -j 8 -W --ignore "_tags/*"
+SPHINXOPTS      ?= -j auto -W -A nuttx_versions="latest,${NUTTX_VERSIONS}"
+SPHINXAUTOOPTS  ?= -j auto -W --ignore "_tags/*"
 SPHINXBUILD     ?= sphinx-build
 SPHINXAUTOBUILD ?= sphinx-autobuild
 SOURCEDIR       = .
@@ -33,6 +33,10 @@ BUILDDIR        = _build
 
 # Put it first so that "make" without argument is like "make help".
 help:
+	$(info =>)
+	$(info => Use `make autobuild` to build live preview of the documentation.)
+	$(info => You can then watch live edit changes at http://localhost:8000.)
+	$(info =>)
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 .PHONY: help Makefile