diff --git a/appveyor.yml b/appveyor.yml
index 95ac4994..439930fe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,6 +61,10 @@ test_script:
   # Run unit tests with nose
   - "python -c \"import nose; nose.main()\" -v -s skimage"
 
+  # Build the docs
+  - pip install sphinx
+  - cd doc && make
+
 artifacts:
   # Archive the generated wheel package in the ci.appveyor.com build report.
   - path: dist\*
diff --git a/doc/make.bat b/doc/make.bat
index a59efe01..68cf7efc 100644
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -5,6 +5,9 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
+if "%PYTHON%" == "" (
+	set PYTHON=python
+)
 set BUILDDIR=_build
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
 if NOT "%PAPER%" == "" (
@@ -41,6 +44,9 @@ if "%1" == "clean" (
 )
 
 if "%1" == "html" (
+	mkdir source/api
+	%PYTHON% tools/build_modref_templates.py 
+	cd source && %PYTHON% random_gallery.py
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	echo.
 	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
@@ -152,4 +158,4 @@ results in %BUILDDIR%/doctest/output.txt.
 	goto end
 )
 
-:end
\ No newline at end of file
+:end