diff --git a/Documentation/Makefile b/Documentation/Makefile
index b5f97d1975..0fb21f5c41 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -74,3 +74,6 @@ clean: clean-sphinx
 
 distclean: clean
 	rm -f corebootPortingGuide.pdf Kconfig.pdf
+
+livesphinx:
+	$(MAKE) -f Makefile.sphinx livehtml
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 2357f186cf..8c10a9f947 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -2,10 +2,11 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
+SPHINXOPTS        =
+SPHINXBUILD       = sphinx-build
+SPHINXAUTOBUILD   = sphinx-autobuild
+PAPER             =
+BUILDDIR          = _build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -54,6 +55,12 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
+.PHONY: livehtml
+livehtml:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)
+	@echo
+	@echo "Autobuild finished. The HTML pages are in $(BUILDDIR)."
+
 .PHONY: dirhtml
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml