diff --git a/docs/Makefile b/docs/Makefile
index d0c3cbf1..20bbd709 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,12 +1,14 @@
-# Minimal makefile for Sphinx documentation
-#
+# Slightly extended makefile for Sphinx documentation
 
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = source
-BUILDDIR      = build
+# Sphinx options
+export SPHINXOPTS    =
+export SPHINXBUILD   = "sphinx-build"
+export SOURCEDIR     = "source"
+export BUILDDIR      = "build"
+
+# LaTeX builder options
+export LATEXMKOPTS   =
+export LATEXOPTS     = "-interaction=nonstopmode"
 
 # Put it first so that "make" without argument is like "make help".
 help:
diff --git a/docs/make.bat b/docs/make.bat
index 6247f7e2..4d165a8f 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -2,13 +2,14 @@
 
 pushd %~dp0
 
-REM Command file for Sphinx documentation
+REM Slightly extended command file for Sphinx documentation
 
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
+set SPHINXOPTS=
+set SPHINXBUILD=sphinx-build
 set SOURCEDIR=source
 set BUILDDIR=build
+set LATEXMKOPTS=
+set LATEXOPTS=-interaction=nonstopmode
 
 if "%1" == "" goto help
 
@@ -21,7 +22,7 @@ if errorlevel 9009 (
 	echo.may add the Sphinx directory to PATH.
 	echo.
 	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
+	echo.https://www.sphinx-doc.org/
 	exit /b 1
 )