diff --git a/CHANGES b/CHANGES
index 22b68f263..f55a5a093 100644
--- a/CHANGES
+++ b/CHANGES
@@ -157,6 +157,7 @@ Bugs fixed
   directory. Thanks to Peter Suter.
 * PR#297, #1571: Add imgpath property to all builders. It make easier to
   develop builder extensions. Thanks to Takeshi Komiya.
+* #1584: Point to master doc in HTML "top" link.
 
 Documentation
 -------------
diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index f33b7cbe7..a7bbbb9aa 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -139,7 +139,7 @@
     {%- if hasdoc('copyright') %}
     <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
     {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
+    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto(master_doc) }}" />
     {%- if parents %}
     <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
     {%- endif %}