diff --git a/mozilla/browser/components/preferences/main.js b/mozilla/browser/components/preferences/main.js
index c93179f25f4..ef0ded86a70 100644
--- a/mozilla/browser/components/preferences/main.js
+++ b/mozilla/browser/components/preferences/main.js
@@ -60,6 +60,17 @@ var gMainPane = {
    * browser.startup.homepage
    * - the user's home page, as a string; if the home page is a set of tabs,
    *   this will be those URLs separated by the pipe character "|"
+   * browser.startup.page
+   * - what page(s) to show when the user starts the application, as an integer:
+   *
+   *     0: a blank page
+   *     1: the home page (as set by the browser.startup.homepage pref)
+   *     2: the last page the user visited (DEPRECATED)
+   *     3: windows and tabs from the last session (a.k.a. session restore)
+   *
+   *   The deprecated option is not exposed in UI; however, if the user has it
+   *   selected and doesn't change the UI for this preference, the deprecated
+   *   option is preserved.
    */
 
   /**
diff --git a/mozilla/browser/components/preferences/main.xul b/mozilla/browser/components/preferences/main.xul
index 97b36d0fd03..00be3687e92 100644
--- a/mozilla/browser/components/preferences/main.xul
+++ b/mozilla/browser/components/preferences/main.xul
@@ -24,6 +24,7 @@
 # Contributor(s):
 #   Ben Goodger <ben@mozilla.org>
 #   Jeff Walden <jwalden+code@mit.edu>
+#   Myk Melez <myk@mozilla.org>
 #
 # 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
@@ -57,7 +58,10 @@
     <preferences id="mainPreferences">
       <!-- XXX Button preferences -->
 
-      <!-- Home Page -->
+      <!-- Startup -->
+      <preference id="browser.startup.page"
+                  name="browser.startup.page"
+                  type="int"/>
       <preference id="browser.startup.homepage"
                   name="browser.startup.homepage"
                   type="wstring"/>
@@ -104,10 +108,22 @@
     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
 #endif
 
-    <!-- Home Page -->
-    <groupbox id="homePageGroup">
-      <caption label="&homePage.label;"/>
+    <!-- Startup -->
+    <groupbox id="startupGroup">
+      <caption label="&startup.label;"/>
 
+      <hbox align="center">
+        <label value="&startupPage.label;" accesskey="&startupPage.accesskey;"
+               control="browserStartupPage"/>
+        <menulist id="browserStartupPage" preference="browser.startup.page">
+          <menupopup>
+            <menuitem label="&startupHomePage.label;"     value="1"/>
+            <menuitem label="&startupBlankPage.label;"    value="0"/>
+            <menuitem label="&startupLastSession.label;"  value="3"/>
+          </menupopup>
+        </menulist>
+      </hbox>
+      <separator class="thin"/>
       <hbox align="center">
         <label value="&location.label;" accesskey="&location.accesskey;" control="browserHomePage"/>
         <textbox id="browserHomePage" class="padded" flex="1"
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/main.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/main.dtd
index ccf317dacd7..01b29fc5b0a 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -1,7 +1,12 @@
-<!ENTITY homePage.label            "Home Page">
+<!ENTITY startup.label             "Startup">
 
-<!ENTITY location.label            "Location:">
-<!ENTITY location.accesskey        "L">
+<!ENTITY startupPage.label         "When &brandShortName; starts:">
+<!ENTITY startupPage.accesskey     "s">
+<!ENTITY startupHomePage.label     "Show my home page">
+<!ENTITY startupBlankPage.label    "Show a blank page">
+<!ENTITY startupLastSession.label  "Show my windows and tabs from last time">
+<!ENTITY location.label            "Home Page:">
+<!ENTITY location.accesskey        "H">
 <!ENTITY useCurrentPage.label      "Use Current Page">
 <!ENTITY useCurrentPage.accesskey  "C">
 <!ENTITY useMultiple.label         "Use Current Pages">
diff --git a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
index 95706780fdf..c842714a35b 100644
--- a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -150,10 +150,6 @@ description {
   margin-bottom: 4px !important;
 }
 
-#browserStartupHomepage {
-  padding: 2px 2px 3px 4px;
-}
-
 #downloadFolderIcon {
   width: 16px;
   height: 16px;
@@ -247,10 +243,6 @@ caption {
   padding: 18px 10px 10px 10px;
 }
 
-#browserStartupHomepage {
-  padding: 0;
-}
-
 #OCSPDialogPane {
   font: message-box !important;
 }
diff --git a/mozilla/browser/themes/winstripe/browser/preferences/preferences.css b/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
index 8fd3b96d4f2..6643d99bdaa 100644
--- a/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
@@ -93,7 +93,7 @@ radio[pane=paneAdvanced]:hover, radio[pane=paneAdvanced][selected="true"] {
 }
 
 /* General Pane */
-#browserStartupHomepage {
+#browserHomePage {
   padding-top: 2px;
   padding-bottom: 3px;
   -moz-padding-start: 4px;