diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index e2678388d..a365b8fd5 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -287,7 +287,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('%(master_str)s', '%(project_fn)s.tex', u'%(project_doc_texescaped_str)s',
+  (master_doc, '%(project_fn)s.tex', u'%(project_doc_texescaped_str)s',
    u'%(author_texescaped_str)s', 'manual'),
 ]
 
@@ -317,7 +317,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('%(master_str)s', '%(project_manpage)s', u'%(project_doc_str)s',
+    (master_doc, '%(project_manpage)s', u'%(project_doc_str)s',
      [author], 1)
 ]
 
@@ -331,7 +331,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('%(master_str)s', '%(project_fn)s', u'%(project_doc_str)s',
+  (master_doc, '%(project_fn)s', u'%(project_doc_str)s',
    author, '%(project_fn)s', 'One line description of project.',
    'Miscellaneous'),
 ]