diff --git a/CHANGES b/CHANGES
index 6d3cad2cf..17486b7b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,7 +26,8 @@ Bugs fixed
 
 * sphinx.htmlwriter: Correctly write the TOC file for any structure of the
   master document.  Also encode non-ASCII characters as entities in TOC
-  and index file.
+  and index file.  Remove two remaining instances of hard-coded
+  "documentation".
 
 * Lots of little fixes to the LaTeX output and style.
 
diff --git a/sphinx/htmlhelp.py b/sphinx/htmlhelp.py
index 05bc851e1..edd05d037 100644
--- a/sphinx/htmlhelp.py
+++ b/sphinx/htmlhelp.py
@@ -63,10 +63,10 @@ Full text search stop list file=%(outname)s.stp
 Full-text search=Yes
 Index file=%(outname)s.hhk
 Language=0x409
-Title=%(project)s %(version)s Documentation
+Title=%(title)s
 
 [WINDOWS]
-%(outname)s="%(project)s %(version)s Documentation","%(outname)s.hhc","%(outname)s.hhk",\
+%(outname)s="%(title)s","%(outname)s.hhc","%(outname)s.hhk",\
 "index.html","index.html",,,,,0x63520,220,0x10384e,[0,0,1024,768],,,,,,,0
 
 [FILES]
@@ -129,6 +129,7 @@ def build_hhx(builder, outdir, outname):
     f = open(path.join(outdir, outname+'.hhp'), 'w')
     try:
         f.write(project_template % {'outname': outname,
+                                    'title': builder.config.html_title,
                                     'version': builder.config.version,
                                     'project': builder.config.project})
         if not outdir.endswith(os.sep):