diff --git a/Makefile b/Makefile
index c9f0a113..94ad0077 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,9 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 upload-docs:
-	$(MAKE) -C docs dirhtml latex
+	$(MAKE) -C docs html dirhtml latex
 	$(MAKE) -C docs/_build/latex all-pdf
+	cd docs/_build/; mv html flask-docs; zip -r flask-docs.zip flask-docs; mv flask-docs html
 	scp -r docs/_build/dirhtml/* pocoo.org:/var/www/flask.pocoo.org/docs/
 	scp -r docs/_build/latex/Flask.pdf pocoo.org:/var/www/flask.pocoo.org/docs/flask-docs.pdf
+	scp -r docs/_build/flask-docs.zip pocoo.org:/var/www/flask.pocoo.org/docs/
diff --git a/docs/contents.rst b/docs/contents.rst.inc
similarity index 100%
rename from docs/contents.rst
rename to docs/contents.rst.inc
diff --git a/docs/index.rst b/docs/index.rst
index e7ab260b..2c3159c7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,4 +25,4 @@ following links:
 .. _Jinja2: http://jinja.pocoo.org/2/
 .. _Werkzeug: http://werkzeug.pocoo.org/
 
-.. include:: contents.rst
+.. include:: contents.rst.inc
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index be54f2de..0b611b45 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -1,4 +1,4 @@
 Flask Documentation
 ===================
 
-.. include:: contents.rst
+.. include:: contents.rst.inc