diff --git a/browser/components/help/locale/en-US/firebird-toc.rdf b/browser/components/help/locale/en-US/firebird-toc.rdf
index 2efa6f076ff0..4c23ef7407e4 100644
--- a/browser/components/help/locale/en-US/firebird-toc.rdf
+++ b/browser/components/help/locale/en-US/firebird-toc.rdf
@@ -249,17 +249,29 @@
   <rdf:Description about="#menu">
     <nc:subheadings>
       <rdf:Seq>
+        <rdf:li> <rdf:Description ID="menu-firefox" nc:name="&brandShortName; (Mac only)" nc:link="menu_reference.xhtml#firefox"/> </rdf:li>
         <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-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 (Mac only)" nc:link="menu_reference.xhtml#window"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-help" nc:name="Help" nc:link="menu_reference.xhtml#help"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
+  <rdf:Description about="#menu-firefox">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li> <rdf:Description ID="menu-firefox-about" nc:name="About &brandFullName;" nc:link="menu_reference.xhtml#about_mac"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-firefox-preferences" nc:name="Preferences..." nc:link="menu_reference.xhtml#prefs_mac"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-firefox-quit" nc:name="Quit &brandShortName;" nc:link="menu_reference.xhtml#quit_mac"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
   <rdf:Description about="#menu-file">
     <nc:subheadings>
       <rdf:Seq>
@@ -388,13 +400,21 @@
     </nc:subheadings>
   </rdf:Description>
 
+  <rdf:Description about="#menu-window">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li> <rdf:Description ID="menu-window-minimize" nc:name="Minimize" nc:link="menu_reference.xhtml#minimize"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-window-zoom" nc:name="Zoom" nc:link="menu_reference.xhtml#zoom"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-window-open-windows" nc:name="(Open Windows)" nc:link="menu_reference.xhtml#open-windows"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
   <rdf:Description about="#menu-help">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="menu-help-help-contents" nc:name="Help Contents" nc:link="menu_reference.xhtml#help_contents"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-help-for-ie-users" nc:name="For Internet Explorer Users" nc:link="menu_reference.xhtml#for_ie_users"/> </rdf:li>
-        <!--rdf:li> <rdf:Description ID="menu-help-release-notes" nc:name="Release Notes" nc:link="menu_reference.xhtml#release_notes"/> </rdf:li-->
-        <rdf:li> <rdf:Description ID="menu-help-tell-a-friend" nc:name="Tell a Friend" nc:link="menu_reference.xhtml#tell_friend"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-help-for-ie-users" nc:name="For Internet Explorer Users (Windows only)" nc:link="menu_reference.xhtml#for_ie_users"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-help-promote" nc:name="Promote &brandShortName;" nc:link="menu_reference.xhtml#promote"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-help-about-mozilla-firebird" nc:name="About &brandFullName;" nc:link="menu_reference.xhtml#about_mozilla_firebird"/> </rdf:li>
       </rdf:Seq>
diff --git a/browser/components/help/locale/en-US/menu_reference.xhtml b/browser/components/help/locale/en-US/menu_reference.xhtml
index 3765d1141acd..6317e40b9b1a 100644
--- a/browser/components/help/locale/en-US/menu_reference.xhtml
+++ b/browser/components/help/locale/en-US/menu_reference.xhtml
@@ -10,6 +10,7 @@ Contributors:
   David Tenser <david.tenser@comhem.se> (original author)
   R.J. Keller <rlk@trfenv.com>
   Jeff Walden <jwalden+code@mit.edu>
+  Steffen Wilberg <steffen.wilberg@web.de>
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -25,16 +26,35 @@ Contributors:
 
   <div class="contentsBox">In this section:
     <ul>
+      <li class="mac"><a href="#firefox">&brandShortName;</a></li>
       <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="#bookmarks">Bookmarks</a></li>
       <li><a href="#tools">Tools</a></li>
+      <li class="mac"><a href="#window">Window</a></li>
       <li><a href="#help">Help</a></li>
     </ul>
   </div>
 
+<div class="mac">
+  <h2 id="firefox">&brandShortName;</h2>
+    <h3 id="about_mac">About &brandFullName;</h3>
+    <p>Displays a dialog box with information about &brandShortName;, including
+      the current version and a brief list of credits.</p>
+
+    <h3 id="prefs_mac">Preferences...</h3>
+    <p>Displays the <a href="prefs.xhtml">&pref.pluralCaps; window</a>,
+      where you can change many &pref.plural; in &brandShortName;.</p>
+
+    <h3 id="quit_mac">Quit &brandShortName;</h3>
+    <p>Closes all opened windows in &brandShortName;, including any active downloads,
+      and exits &brandShortName; completely. If you happen to select this menu item with
+      open tabs, windows, or downloads, &brandShortName; will ask you to confirm your
+      choice to prevent accidental exits.</p>
+</div>
+
 <h2 id="file">File</h2>
 
   <h3 id="new_window">New Window</h3>
@@ -92,6 +112,7 @@ Contributors:
     web pages you've previously visited without being connected to the
     Internet.</p>
 
+<div class="noMac">
   <h3 id="exit">
     <span class="win">Exit</span>
     <span class="noWin">Quit</span>
@@ -100,6 +121,7 @@ Contributors:
     and exits &brandShortName; completely. If you happen to select this menu item with
     open tabs, windows, or downloads, &brandShortName; will ask you to confirm your
     choice to prevent accidental exits.</p>
+</div>
 
 <h2 id="edit">Edit</h2>
 
@@ -305,13 +327,22 @@ Contributors:
     document type, encoding, size, and security information.  The dialog also
     displays lists of the media and links used on the page.</p>
 
-  <h3 class="noUnix" id="options">&pref.pluralCaps;</h3>
-  <p class="noUnix">Displays the <a href="prefs.xhtml">&pref.pluralCaps; window</a>,
+  <h3 class="win" id="options">&pref.pluralCaps;</h3>
+  <p class="win">Displays the <a href="prefs.xhtml">&pref.pluralCaps; window</a>,
     where you can change many &pref.plural; in &brandShortName;.</p>
 
-<!--XXX blah, blah, blah -->
-<!--XXX Help contribs need to test Macs as well as Lin/Win -->
-<!--XXX the Mac Window menu should be documented here -->
+<div class="mac">
+  <h2 id="window">Window</h2>
+
+    <h3 id="minimize">Minimize</h3>
+    <p>Minimizes the current window.</p>
+
+    <h3 id="zoom">Zoom</h3>
+    <p>Enlarges or restores the current window.</p>
+    
+    <h3 id="open-windows">(Open Windows)</h3>
+    <p>This menu displays all the open windows by their title.</p>
+</div>
 
 <h2 id="help">Help</h2>
 
@@ -319,7 +350,7 @@ Contributors:
   <p>Opens the &brandShortName; Help window, which contains useful information
     that can help you browse the web.</p>
 
-  <h3 id="for_ie_users">For Internet Explorer Users (Windows and Mac only)</h3>
+  <h3 id="for_ie_users">For Internet Explorer Users (Windows only)</h3>
   <p>Opens this Help window displaying information that can
     help Internet Explorer users transition to &brandShortName;.</p>
 
@@ -334,7 +365,7 @@ Contributors:
   <p>Displays a dialog box with information about &brandShortName;, including
     the current version and a brief list of credits.</p>
 
-<div class="contentsBox"><em>25 October 2004</em></div>
+<div class="contentsBox"><em>04 November 2004</em></div>
 <p>Copyright &copy; 2003-2004 Contributors to the Mozilla Help Viewer Project.</p>
 </body>
 </html>