diff --git a/appveyor.yml b/appveyor.yml
index 95ac4994..35fc96b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,15 +14,15 @@ environment:
       PYTHON_ARCH: "32"
 
    # disable other builds until they can be run in parallel
-   #- PYTHON: "C:\\Python27_64"
-   #  PYTHON_VERSION: "2.7"
-   #  PYTHON_ARCH: "64"
+    #- PYTHON: "C:\\Python27_64"
+    #  PYTHON_VERSION: "2.7"
+    #  PYTHON_ARCH: "64"
 
     #- PYTHON: "C:\\Python34_32"
     #  PYTHON_VERSION: "3.4.2"
     #  PYTHON_ARCH: "32"
 
-    #- PYTHON: "C:\\Python24_64"
+    #- PYTHON: "C:\\Python34_64"
     #  PYTHON_VERSION: "3.4.2"
     #  PYTHON_ARCH: "64"
 
@@ -46,11 +46,14 @@ install:
   - "pip install --pre --no-index --find-links dist/ scikit-image"
 
 
-
 # Not a .NET project, we build scikit-image in the install step instead
 build: false
 
 test_script:
+  # Build the docs
+  - pip install sphinx
+  - SET PYTHON=%PYTHON%\\python.exe && cd doc && make html
+
   # Change to a non-source folder to make sure we run the tests on the
   # installed library.
   - "cd C:\\"
diff --git a/doc/make.bat b/doc/make.bat
index a59efe01..b37f82fa 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,10 @@ if "%1" == "clean" (
 )
 
 if "%1" == "html" (
+	mkdir source/api
+	%PYTHON% tools/build_modref_templates.py 
+	cd source && %PYTHON% random_gallery.py
+	cd ..
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	echo.
 	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
@@ -109,6 +116,8 @@ if "%1" == "epub" (
 )
 
 if "%1" == "latex" (
+	mkdir source/api
+	%PYTHON% tools/build_modref_templates.py 
 	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
 	echo.
 	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
@@ -152,4 +161,4 @@ results in %BUILDDIR%/doctest/output.txt.
 	goto end
 )
 
-:end
\ No newline at end of file
+:end