diff --git a/AUTHORS b/AUTHORS
index f0c855913..864ec2788 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,7 @@ Other co-maintainers:
 * Rob Ruana <@RobRuana>
 * Robert Lehmann <@lehmannro>
 * Roland Meister <@rolmei>
+* Takeshi Komiya <@tk0miya>
 
 Other contributors, listed alphabetically, are:
 
@@ -30,7 +31,6 @@ Other contributors, listed alphabetically, are:
 * Martin Hans -- autodoc improvements
 * Doug Hellmann -- graphviz improvements
 * Timotheus Kampik - JS theme & search enhancements
-* Takeshi Komiya -- numref feature
 * Dave Kuhlman -- original LaTeX writer
 * Blaise Laflamme -- pyramid theme
 * Thomas Lamb -- linkcheck builder
@@ -52,7 +52,7 @@ Other contributors, listed alphabetically, are:
 * Rob Ruana -- napoleon extension
 * Stefan Seefeld -- toctree improvements
 * Gregory Szorc -- performance improvements
-* Shibukawa Yoshiki -- pluggable search API and Japanese search
+* Shibukawa Yoshiki -- pluggable search API and Japanese search, epub3 builder improvements
 * Taku Shimizu -- epub3 builder
 * Antonio Valentino -- qthelp builder
 * Filip Vavera -- napoleon todo directive
@@ -65,6 +65,7 @@ Other contributors, listed alphabetically, are:
 * Michael Wilson -- Intersphinx HTTP basic auth support
 * Joel Wurtz -- cellspanning support in LaTeX
 * Hong Xu -- svg support in imgmath extension and various bug fixes
+* Bruce Mitchener -- Minor epub improvement
 
 Many thanks for all contributions!
 
diff --git a/CHANGES b/CHANGES
index b2bea1dae..11e9f9306 100644
--- a/CHANGES
+++ b/CHANGES
@@ -109,6 +109,7 @@ Features added
 * #2851: ``sphinx.ext.math`` emits missing-reference event if equation not found
 * #1210: ``eqref`` role now supports cross reference
 * #2892: Added ``-a`` (``--append-syspath``) option to ``sphinx-apidoc``
+* #1604: epub3 builder: Obey font-related CSS when viewing in iBooks.
 
 Bugs fixed
 ----------
diff --git a/sphinx/builders/epub3.py b/sphinx/builders/epub3.py
index 36a2ae33c..9630f41a3 100644
--- a/sphinx/builders/epub3.py
+++ b/sphinx/builders/epub3.py
@@ -53,7 +53,8 @@ NAVLIST_INDENT = '  '
 PACKAGE_DOC_TEMPLATE = u'''\
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="%(lang)s"
-      unique-identifier="%(uid)s">
+ unique-identifier="%(uid)s"
+ prefix="ibooks:http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/">
   <metadata xmlns:opf="http://www.idpf.org/2007/opf"
         xmlns:dc="http://purl.org/dc/elements/1.1/">
     <dc:language>%(lang)s</dc:language>
@@ -66,6 +67,9 @@ PACKAGE_DOC_TEMPLATE = u'''\
     <dc:identifier id="%(uid)s">%(id)s</dc:identifier>
     <dc:date>%(date)s</dc:date>
     <meta property="dcterms:modified">%(date)s</meta>
+    <meta property="ibooks:version">%(version)s</meta>
+    <meta property="ibooks:specified-fonts">true</meta>
+    <meta property="ibooks:binding">true</meta>
   </metadata>
   <manifest>
     <item id="ncx" href="toc.ncx" media-type="application/x-dtbncx+xml" />
@@ -128,6 +132,7 @@ class Epub3Builder(EpubBuilder):
         metadata['page_progression_direction'] = self.esc(
             self.config.epub3_page_progression_direction) or 'default'
         metadata['date'] = self.esc(datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"))
+        metadata['version'] = self.esc(self.config.version)
         return metadata
 
     def new_navlist(self, node, level, has_child):