diff --git a/akka-docs/Makefile b/akka-docs/Makefile
index 3c0041537d..c78d5ba317 100644
--- a/akka-docs/Makefile
+++ b/akka-docs/Makefile
@@ -34,6 +34,7 @@ endif
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  pygments   to locally install the custom pygments styles"
+	@echo "  epub       to make an epub"
 	@echo "  html       to make standalone HTML files"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@@ -53,6 +54,11 @@ pygments:
 $(LOCALPACKAGES):
 	$(MAKE) pygments
 
+epub: $(LOCALPACKAGES)
+	$(SPHINXBUILD) $(SPHINXFLAGS) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
 html: $(LOCALPACKAGES)
 	$(SPHINXBUILD) $(SPHINXFLAGS) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
diff --git a/akka-docs/conf.py b/akka-docs/conf.py
index 2e66d8b56c..b632430b59 100644
--- a/akka-docs/conf.py
+++ b/akka-docs/conf.py
@@ -52,6 +52,14 @@ html_context = {
   'include_analytics': 'online' in tags
 }
 
+# -- Options for EPUB output ---------------------------------------------------
+epub_author = "Typesafe Inc"
+epub_language = "en"
+epub_publisher = epub_author
+epub_identifier = "http://doc.akka.io/docs/akka/snapshot/"
+epub_scheme = "URL"
+epub_cover = ("_sphinx/static/akka.png", "")
+
 # -- Options for LaTeX output --------------------------------------------------
 
 def setup(app):