diff --git a/doc/conf.py b/doc/conf.py
index 8a0e4696a..e9998d237 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,6 +40,7 @@ epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js',
     '_static/basic.css', 'search.html', '_static/websupport.js']
 epub_fix_images = False
 epub_max_image_width = 0
+epub_show_urls = 'inline'
 
 latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',
                     'Georg Brandl', 'manual', 1)]
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 8ac943a26..f81b14c97 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -334,6 +334,10 @@ epub_copyright = u'%(copyright_str)s'
 
 # Scale large images.
 #epub_max_image_width = 0
+
+# If 'no', URL addresses will not be shown.
+#epub_show_urls = 'inline'
+
 '''
 
 INTERSPHINX_CONFIG = '''