diff --git a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
index a7250b8abac..a9a04eea252 100644
--- a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
+++ b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
@@ -22,6 +22,7 @@
    -                 Mike Potter <mikep@oeone.com>
    -                 Chris Charabaruk <coldacid@meldstar.com>
    -                 Matthew Willis <mattwillis@gmail.com>
+   -                 Stefan Sitter <ssitter@googlemail.com>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -49,7 +50,7 @@
 <!ENTITY event.new.todo.key                     "T">
 <!ENTITY event.new.todo.accesskey               "T">
 
-<!ENTITY calendar.new.server.label              "New Calendar File…">
+<!ENTITY calendar.new.server.label              "New Calendar…">
 <!ENTITY calendar.new.server.key                "L">
 <!ENTITY calendar.new.server.accesskey          "l">
 
@@ -95,6 +96,12 @@
 <!ENTITY calendar.export.label                  "Export Selection...">
 <!ENTITY calendar.export.accesskey              "E">
 
+<!ENTITY calendar.export.calendar.label         "Export Calendar…">
+<!ENTITY calendar.export.calendar.accesskey     "E">
+
+<!ENTITY calendar.export.selection.label        "Export Selection…">
+<!ENTITY calendar.export.selection.accesskey    "S">
+
 <!ENTITY calendar.subscribe.label               "Subscribe to Remote Calendar…">
 <!ENTITY calendar.subscribe.accesskey           "R">
 
@@ -105,12 +112,21 @@
 <!ENTITY calendar.publish.label                 "Publish...">
 <!ENTITY calendar.publish.accesskey             "b">
 
+<!ENTITY calendar.publish.calendar.label        "Publish Calendar…">
+<!ENTITY calendar.publish.calendar.accesskey    "b">
+
+<!ENTITY calendar.publish.selection.label       "Publish Selection…">
+<!ENTITY calendar.publish.selection.accesskey   "c">
+
 <!ENTITY calendar.quit.label                    "Quit">
 <!ENTITY calendar.quit.accesskey                "Q">
 <!ENTITY calendar.quit.label.mac                "Quit &brandShortName;">
 <!ENTITY calendar.quit.key.mac                  "Q">
 <!ENTITY calendar.quit.modifiers.mac            "accel">
 
+<!ENTITY calendar.exit.label                    "Exit">
+<!ENTITY calendar.exit.accesskey                "x">
+
 <!ENTITY calendar.about.label                   "About Calendar">
 <!ENTITY calendar.about.accesskey               "C">
 
diff --git a/calendar/sunbird/base/content/calendar-menubar.inc b/calendar/sunbird/base/content/calendar-menubar.inc
index 87329c4550e..3a3c8953d9b 100644
--- a/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/calendar/sunbird/base/content/calendar-menubar.inc
@@ -27,6 +27,7 @@
 #                 ArentJan Banck <ajbanck@planet.nl>
 #                 Eric Belhaire <belhaire@ief.u-psud.fr>
 #                 Matthew Willis <mattwillis@gmail.com>
+#                 Stefan Sitter <ssitter@googlemail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -59,12 +60,12 @@
                      label="&event.new.todo;"
                      accesskey="&event.new.todo.accesskey;"
                      observes="new_todo_command"/>
-           <!-- XXX lilmatt: Finish this! -->
+           <!-- XXX lilmatt: Finish this!
            <menuitem key="new_journal_key"
                      id="calendar-new-journal-menu"
                      label="&calendar.new.journal.label;"
                      accesskey="&calendar.new.journal.accesskey;"
-                     disabled="true"/>
+                     disabled="true"/> -->
            <menuitem id="calendar-new-calendar-menu"
                      key="new_calendar_key"
                      label="&calendar.new.server.label;"
@@ -75,32 +76,11 @@
                      label="&calendar.open.file.label;"
                      accesskey="&calendar.open.file.accesskey;"
                      observes="open_local_calendar_command"/>
-           <menuitem id="unifinder-modify-menu"
-                     key="modify_event_key"
-                     label="&event.edit.event;"
-                     accesskey="&event.edit.event.accesskey;"
-                     observes="modify_command"/>
-           <menuitem id="calendar-close"
-                     key="key_close"
-#ifdef XP_MACOSX
-                     label="&calendar.menu.options.close.mac;"
-#else
-                     label="&calendar.menu.options.close;"
-                     accesskey="&calendar.menu.options.close.accesskey;"
-#endif
-                     observes="close_calendar_command"/>
-           <menuseparator/>
-
            <menuitem id="calendar-addserver-menu"
                      label="&calendar.subscribe.label;"
                      accesskey="&calendar.subscribe.accesskey;"
                      observes="new_calendar_command"/>
-           <menuitem id="calendar-reloadserver-menu"
-                     key="reload_server_key"
-                     label="&calendar.reloadserver.label;"
-                     accesskey="&calendar.reloadserver.accesskey;"
-                     observes="reload_remote_calendars"/>
-           <menuseparator/>
+           <menuseparator id="calendar-new-sep"/>
 
            <!-- import: pulling data into existing files -->
            <menuitem id="calendar-import-menu"
@@ -110,9 +90,14 @@
                      observes="import_command"/>
            <!-- export: getting data out of existing files -->
            <menuitem id="calendar-export-menu"
-                     label="&calendar.export.label;"
-                     accesskey="&calendar.export.accesskey;"
+                     label="&calendar.export.selection.label;"
+                     accesskey="&calendar.export.selection.accesskey;"
                      observes="export_command"/>
+           <menuitem id="calendar-export-calendar-menu"
+                     label="&calendar.export.calendar.label;"
+                     accesskey="&calendar.export.calendar.accesskey;"
+                     observes="ask_and_export_calendar"/>
+           <menuseparator id="calendar-importexport-sep"/>
            <!-- Disable this until Sunbird gets mail support
            <menuitem id="calendar-mail-event"
                      key="send_event_key"
@@ -121,10 +106,22 @@
                      observes="send_event_command"/>
            -->
            <menuitem id="calendar-publish-menu"
-                     label="&calendar.publish.label;"
-                     accesskey="&calendar.publish.accesskey;"
+                     label="&calendar.publish.selection.label;"
+                     accesskey="&calendar.publish.selection.accesskey;"
                      observes="publish_events_command"/>
-           <menuseparator/>
+           <menuitem id="calendar-publish-calendar-menu"
+                     label="&calendar.publish.calendar.label;"
+                     accesskey="&calendar.publish.calendar.accesskey;"
+                     observes="ask_and_publish_calendar"/>
+           <menuseparator id="calendar-publish-sep"/>
+
+           <menuitem id="calendar-reloadserver-menu"
+                     key="reload_server_key"
+                     label="&calendar.reloadserver.label;"
+                     accesskey="&calendar.reloadserver.accesskey;"
+                     observes="reload_remote_calendars"/>
+           <menuseparator id="calendar-reload-sep"/>
+
            <menuitem id="calendar-page-setup-menu"
                      label="&calendar.pagesetup.label;"
                      accesskey="&calendar.pagesetup.accesskey;"
@@ -141,10 +138,17 @@
                      oncommand="goQuitApplication()"/>
 #else
            <menuseparator id="calendar-print-sep"/>
+#ifdef XP_WIN
+           <menuitem id="calendar-quit-menu"
+                     label="&calendar.exit.label;"
+                     accesskey="&calendar.exit.accesskey;"
+                     oncommand="goQuitApplication()"/>
+#else
            <menuitem id="calendar-quit-menu"
                      label="&calendar.quit.label;"
                      accesskey="&calendar.quit.accesskey;"
                      oncommand="goQuitApplication()"/>
+#endif
 #endif
          </menupopup>
        </menu>
@@ -179,6 +183,11 @@
                      label="&calendar.paste.label;"
                      accesskey="&calendar.paste.accesskey;"
                      observes="paste_command"/>
+           <menuitem id="unifinder-modify-menu"
+                     key="modify_event_key"
+                     label="&event.edit.event;"
+                     accesskey="&event.edit.event.accesskey;"
+                     observes="modify_command"/>
            <menuitem id="unifinder-remove-menu"
                      key="delete_key"
                      label="&event.delete.event;"
diff --git a/calendar/sunbird/base/content/calendar-sets.inc b/calendar/sunbird/base/content/calendar-sets.inc
index bf05a4574ad..6e4e80dd030 100644
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -27,6 +27,7 @@
 #                 ArentJan Banck <ajbanck@planet.nl>
 #                 Eric Belhaire <belhaire@ief.u-psud.fr>
 #                 Matthew Willis <mattwillis@gmail.com>
+#                 Stefan Sitter <ssitter@googlemail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -84,9 +85,11 @@
 
   <command id="import_command" oncommand="loadEventsFromFile()"/>
   <command id="export_command" oncommand="saveEventsToFile(gCalendarWindow.EventSelection.selectedEvents)" disabled="true" disabledwhennoeventsselected="true"/>
+  <command id="ask_and_export_calendar" oncommand="exportEntireCalendar()"/>
 
   <command id="reload_remote_calendars" oncommand="reloadCalendars()"/>
   <command id="publish_calendar" oncommand="publishEntireCalendar(getDefaultCalendar())"/>
+  <command id="ask_and_publish_calendar" oncommand="publishEntireCalendar()"/>
   <command id="publish_events_command" oncommand="publishCalendarData()" disabled="true" disabledwhennoeventsselected="true"/>
 
   <command id="toggle_tasks_in_view"