diff --git a/mozilla/calendar/resources/content/calendar.xul b/mozilla/calendar/resources/content/calendar.xul
index c783fbc9fce..76cffa6c55e 100644
--- a/mozilla/calendar/resources/content/calendar.xul
+++ b/mozilla/calendar/resources/content/calendar.xul
@@ -131,34 +131,47 @@
   <command id="close_calendar_command" oncommand="closeCalendar()"/>
 
   <command id="wizard_command" oncommand="launchWizard()" collapsed="true"/>
+#ifdef XP_MACOSX
+  <command id="minimizeWindowCmd" oncommand="window.minimize();"/>
+  <command id="zoomWindowCmd" oncommand="zoomWindow();"/>
+#endif
 </commandset>
 
 <keyset>
-  <key id="delete_key" keycode="VK_DELETE" observes="delete_command_no_confirm"/>
-  <key id="new_event_key" key="N" modifiers="control" observes="new_command"/>
-  <key id="new_todo_key" key="T" modifiers="control" observes="new_todo_command"/>
-  <key id="modify_event_key" key="E" modifiers="control" observes="modify_command"/>
-  <key id="print_key" key="P" modifiers="control" observes="print_command"/>
-  <key id="import_key" key="I" modifiers="control" observes="import_command"/>
-  <key id="export_key" key="O" modifiers="control" observes="export_command"/>
-  <key id="send_event_key" key="M" modifiers="control" observes="send_event_command"/>
-  
-  <key id="key_selectAll" key="A" modifiers="control" observes="select_all_command"/>
-  <key id="key_cut" key="X" modifiers="control" observes="cut_command"/>
-  <key id="key_copy" key="C" modifiers="control" observes="copy_command"/>
-  <key id="key_paste" key="V" modifiers="control" observes="paste_command"/>
-  
-  <key id="view_day_key"  keycode="VK_F1" observes="day_view_command"/>
-  <key id="view_week_key"  keycode="VK_F2" observes="week_view_command"/>
-  <key id="view_multiweek_key" keycode="VK_F3" observes="multiweek_view_command"/>
-  <key id="view_month_key" keycode="VK_F4" observes="month_view_command"/>
-  
-  <key id="go_backward_key" keycode="VK_PAGE_UP" observes="previous_command"/>
-  <key id="go_forward_key"  keycode="VK_PAGE_DOWN" observes="next_command"/>
-  <key id="go_to_today_key"  keycode="VK_DOWN" modifiers="control" observes="go_today_command"/>
-  <key id="go_to_date_key" keycode="VK_UP" modifiers="control" observes="go_date_command"/>
-  
-  <key id="key_close" key="W" modifiers="control" observes="close_calendar_command"/>
+  <key id="new_event_key"        key="&event.new.event.key;"             observes="new_command"                 modifiers="accel"/>
+  <key id="new_todo_key"         key="&event.new.todo.key;"              observes="new_todo_command"            modifiers="accel"/>
+  <key id="modify_event_key"     key="&event.edit.event.key;"            observes="modify_command"              modifiers="accel"/>
+  <key id="new_calendar_key"     key="&calendar.new.server.key;"         observes="new_local_calendar_command"  modifiers="accel"/>
+  <key id="open_calendar_key"    key="&calendar.open.file.key;"          observes="open_local_calendar_command" modifiers="accel"/>
+  <key id="key_close"            key="&calendar.menu.options.close.key;" observes="close_calendar_command"      modifiers="accel"/>
+#ifdef XP_MACOSX
+  <key id="send_event_key"       key="&event.mail.event.key;"            observes="send_event_command"          modifiers="shift, accel"/>
+#else
+  <key id="send_event_key"       key="&event.mail.event.key;"            observes="send_event_command"          modifiers="accel"/>
+#endif
+  <key id="print_key"            key="&calendar.print.key;"              observes="print_command"               modifiers="accel"/>
+
+  <key id="key_cut"              key="&calendar.cut.key;"                observes="cut_command"                 modifiers="accel"/>
+  <key id="key_copy"             key="&calendar.copy.key;"               observes="copy_command"                modifiers="accel"/>
+  <key id="key_paste"            key="&calendar.paste.key;"              observes="paste_command"               modifiers="accel"/>
+  <key id="delete_key"           keycode="VK_DELETE"                     observes="delete_command_no_confirm"/>
+  <key id="key_selectAll"        key="&calendar.selectall.key;"          observes="select_all_command"          modifiers="accel"/>
+
+  <key id="view_day_key"         keycode="VK_F1"                         observes="day_view_command"/>
+  <key id="view_week_key"        keycode="VK_F2"                         observes="week_view_command"/>
+  <key id="view_multiweek_key"   keycode="VK_F3"                         observes="multiweek_view_command"/>
+  <key id="view_month_key"       keycode="VK_F4"                         observes="month_view_command"/>
+
+  <key id="go_to_today_key"      keycode="VK_DOWN"                       observes="go_today_command"            modifiers="accel"/>
+  <key id="go_to_date_key"       keycode="VK_UP"                         observes="go_date_command"             modifiers="accel"/>
+  <key id="go_backward_key"      keycode="VK_PAGE_UP"                    observes="previous_command"/>
+  <key id="go_forward_key"       keycode="VK_PAGE_DOWN"                  observes="next_command"/>
+
+  <key id="import_key"           key="&calendar.import.key;"             observes="import_command"              modifiers="accel"/>
+
+#ifdef XP_MACOSX
+  <key id="key_minimizeWindow"   key="&minimizeWindow.key;"              command="minimizeWindow"               modifiers="accel"/>
+#endif
 </keyset>
 
 <keyset id="tasksKeys"/>
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index b9f3478982a..8cab38a4e21 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -9,7 +9,7 @@ calendar.jar:
     content/calendar/alertDialog.xul (content/alertDialog.xul)
     content/calendar/attachFile.js (content/attachFile.js)
     content/calendar/calendar.js (content/calendar.js)
-    content/calendar/calendar.xul (content/calendar.xul)
+*   content/calendar/calendar.xul (content/calendar.xul)
     content/calendar/calendarEvent.js (content/calendarEvent.js)
     content/calendar/calExtOverlay.js (content/calExtOverlay.js)
     content/calendar/calExtOverlay.xul (content/calExtOverlay.xul)