diff --git a/CHANGES b/CHANGES
index fe0924e94..2fb0c3c0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -111,6 +111,11 @@ New features added
 
   - Added ``cmember`` role for consistency.
 
+Bugs fixed
+----------
+
+* Properly escape quotes in HTML help attribute values.
+
 
 Release 0.4.3 (Oct 8, 2008)
 ===========================
diff --git a/sphinx/htmlhelp.py b/sphinx/htmlhelp.py
index ea21d0ce1..33dbd9ff5 100644
--- a/sphinx/htmlhelp.py
+++ b/sphinx/htmlhelp.py
@@ -164,7 +164,8 @@ def build_hhx(builder, outdir, outname):
                     write_toc(subnode, ullevel)
             elif isinstance(node, nodes.reference):
                 link = node['refuri']
-                item = object_sitemap % (cgi.escape(node.astext()), link)
+                title = cgi.escape(node.astext()).replace('"','"')
+                item = object_sitemap % (title, link)
                 f.write(item.encode('ascii', 'xmlcharrefreplace'))
             elif isinstance(node, nodes.bullet_list):
                 if ullevel != 0: