diff --git a/mozilla/extensions/help/resources/content/helpMenuOverlay.xul b/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
index 97c3e4c216c..64f0011c75e 100644
--- a/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
+++ b/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE overlay [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
 <!ENTITY % helpMenuDTD SYSTEM "chrome://help/locale/helpMenuOverlay.dtd">
 %helpMenuDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 ]>
 
 <overlay id="helpMenuID"
@@ -10,8 +14,8 @@
   <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <menupopup id="helpPopup">
-    <menuitem label="&helpContents.label;" 
-      accesskey="&helpContents.accesskey;" 
+    <menuitem label="&openHelpCmd.label;" 
+      accesskey="&openHelpCmd.accesskey;" 
       position="1" id="help"
       oncommand="openHelp();" />   
     <menuitem label="&helpForIEUsers.label;"
diff --git a/mozilla/extensions/help/resources/locale/en-US/helpMenuOverlay.dtd b/mozilla/extensions/help/resources/locale/en-US/helpMenuOverlay.dtd
index 6a885af5ccc..a6af9168031 100644
--- a/mozilla/extensions/help/resources/locale/en-US/helpMenuOverlay.dtd
+++ b/mozilla/extensions/help/resources/locale/en-US/helpMenuOverlay.dtd
@@ -1,5 +1,4 @@
-<!ENTITY helpContents.label       "Help Contents">
-<!ENTITY helpContents.accesskey   "h">
+<!-- Platform-specific entities are in platformCommunicatorOverlay.dtd -->
 
 <!ENTITY helpForIEUsers.label     "For Internet Explorer Users">
-<!ENTITY helpForIEUsers.accesskey  "i">
\ No newline at end of file
+<!ENTITY helpForIEUsers.accesskey "I">
diff --git a/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
index 206aad1d3b6..f125c8d7af4 100644
--- a/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
@@ -3,8 +3,8 @@
 
 <!DOCTYPE overlay [
 
-<!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
-%platformCommunicationDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 
diff --git a/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
index a5879a35f96..b9398c020ff 100644
--- a/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
@@ -3,8 +3,8 @@
 
 <!DOCTYPE overlay [
 
-<!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
-%platformCommunicationDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 
diff --git a/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
index 88ab46505ae..255485338b0 100644
--- a/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
@@ -3,8 +3,8 @@
 
 <!DOCTYPE overlay [
 
-<!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
-%platformCommunicationDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd
index 9176d1919fc..6df2fdaeb27 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/mac/platformCommunicatorOverlay.dtd
@@ -23,3 +23,7 @@
 <!ENTITY minimizeWindowCmd.label    "Minimize">
 <!ENTITY minimizeWindowCmd.key      "M">
 <!ENTITY zoomWindowCmd.label        "Zoom">
+
+<!-- Help viewer -->
+<!ENTITY openHelpCmd.label          "&brandShortName; Help">
+<!ENTITY openHelpCmd.accesskey      "H">
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd
index a25db5da33c..4881ff369f6 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/unix/platformCommunicatorOverlay.dtd
@@ -17,3 +17,7 @@
 <!ENTITY findTypeLinksCmd.key       "'">
 
 <!ENTITY accel.emacs_conflict       "accel,shift">
+
+<!-- Help viewer -->
+<!ENTITY openHelpCmd.label          "Help Contents">
+<!ENTITY openHelpCmd.accesskey      "H">
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd
index 7a258d94088..9ba041b9ab0 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/win/platformCommunicatorOverlay.dtd
@@ -17,4 +17,8 @@
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
-<!ENTITY accel.emacs_conflict       "accel">
+<!ENTITY accel.emacs_conflict           "accel">
+
+<!-- Help viewer -->
+<!ENTITY openHelpCmd.label              "Help Contents">
+<!ENTITY openHelpCmd.accesskey          "H">