diff --git a/Makefile b/Makefile
index 43f47275..b7094ce6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,13 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 upload-docs:
-	$(MAKE) -C docs html dirhtml latex
+	$(MAKE) -C docs html dirhtml latex epub
 	$(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
 	rsync -a docs/_build/dirhtml/ pocoo.org:/var/www/flask.pocoo.org/docs/
 	rsync -a docs/_build/latex/Flask.pdf pocoo.org:/var/www/flask.pocoo.org/docs/flask-docs.pdf
 	rsync -a docs/_build/flask-docs.zip pocoo.org:/var/www/flask.pocoo.org/docs/flask-docs.zip
+	rsync -a docs/_build/epub/Flask.epub pocoo.org:/var/www/flask.pocoo.org/docs/flask-docs.epub
 
 docs:
 	$(MAKE) -C docs html
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 850fe86a..76777225 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -9,6 +9,7 @@
 </p>
 <ul>
   <li><a href="http://flask.pocoo.org/docs/flask-docs.pdf">as PDF</a>
+  <li><a href="http://flask.pocoo.org/docs/flask-docs.epub">as ePub</a>
   <li><a href="http://flask.pocoo.org/docs/flask-docs.zip">as zipped HTML</a>
 </ul>
 <h3>Useful Links</h3>