diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index cc98b6568ad..695ca541d60 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -370,7 +370,7 @@
               </menupopup>
             </menu>
 #else
-            <menu id="go-menu" label="&goMenu.label;" accesskey="&goMenu.accesskey;" 
+            <menu id="go-menu" label="&historyMenu.label;" accesskey="&historyMenu.accesskey;" 
                   oncommand="var url = event.target.getAttribute('statustext'); if (url) openUILink(url, event, false, true);"
                   onclick="checkForMiddleClick(this, event);">
 
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
index e62f3da22c9..65161c11107 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
@@ -180,9 +180,10 @@
 <!ENTITY viewCustomizeToolbar.label       "Customize..."> 
 <!ENTITY viewCustomizeToolbar.accesskey     "C"> 
 
-<!-- XXX places only -->
+<!-- XXX historyMenu entities are used with or without places (bug 336058) -->
 <!ENTITY historyMenu.label "History">
 <!ENTITY historyMenu.accesskey "i">
+<!-- XXX places only -->
 <!ENTITY historyHomeCmd.label "Home">
 <!ENTITY historyHomeCmd.accesskey "h">
 <!ENTITY historySearchCmd.label "Search in History...">
diff --git a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
index 05466d57813..d3b5034083a 100644
--- a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
+++ b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf
@@ -241,7 +241,7 @@
         <rdf:li> <rdf:Description ID="menu-file" nc:name="File" nc:link="menu_reference.xhtml#file"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-edit" nc:name="Edit" nc:link="menu_reference.xhtml#edit"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-view" nc:name="View" nc:link="menu_reference.xhtml#view"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-go" nc:name="Go" nc:link="menu_reference.xhtml#go"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-go" nc:name="History" nc:link="menu_reference.xhtml#go"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-bookmarks" nc:name="Bookmarks" nc:link="menu_reference.xhtml#bookmarks"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-tools" nc:name="Tools" nc:link="menu_reference.xhtml#tools"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-window" nc:name="Window" nc:link="menu_reference.xhtml#window" nc:platform="mac"/> </rdf:li>
diff --git a/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml b/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml
index c44d823e11f..3936e6d253c 100644
--- a/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml
+++ b/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml
@@ -30,7 +30,7 @@ Contributors:
       <li><a href="#file">File</a></li>
       <li><a href="#edit">Edit</a></li>
       <li><a href="#view">View</a></li>
-      <li><a href="#go">Go</a></li>
+      <li><a href="#go">History</a></li>
       <li><a href="#bookmarks">Bookmarks</a></li>
       <li><a href="#tools">Tools</a></li>
       <li class="mac"><a href="#window">Window</a></li>
@@ -265,9 +265,9 @@ Contributors:
       hidden, you can always restore the window anyway by pressing
       <kbd>F11</kbd>.</p>
   </div>
-<h2 id="go">Go</h2>
+<h2 id="go">History</h2>
 
-  <p>The Go menu contains a list of the most recently visited web sites.</p>
+  <p>The History menu contains a list of the most recently visited web sites.</p>
 
   <h3 id="back">Back</h3>
   <p>Navigates back one page in history. This is the same as clicking on the
diff --git a/mozilla/browser/locales/en-US/chrome/help/using_firebird.xhtml b/mozilla/browser/locales/en-US/chrome/help/using_firebird.xhtml
index 5a72b6a9ef9..3c5b9e70797 100644
--- a/mozilla/browser/locales/en-US/chrome/help/using_firebird.xhtml
+++ b/mozilla/browser/locales/en-US/chrome/help/using_firebird.xhtml
@@ -102,9 +102,9 @@ Contributors:
        width="320" height="30" alt=""/><br/>
   </li>
   <li>To choose from pages you've visited during the current session, open the
-    Go menu and use the list in the bottom section of the menu.</li>
+    History menu and use the list in the bottom section of the menu.</li>
   <li>To choose from pages you've visited during the past several sessions,
-    open the <em>Go</em> menu and choose <em>History</em>. You will see the
+    open the <em>History</em> menu and choose <em>History</em>. You will see the
     History Sidebar. The History Sidebar displays a list of folders.
     Clicking the folders displays subfolders or titles of web pages.
     You can click a page's title to view that page.</li>