--- a/browser/metro/components/BrowserCLH.js
+++ b/browser/metro/components/BrowserCLH.js
@@ -56,17 +56,17 @@ function needHomepageOverride() {
   let savedmstone = null;
   try {
     savedmstone = Services.prefs.getCharPref("browser.startup.homepage_override.mstone");
   } catch (e) {}
 
   if (savedmstone == "ignore")
     return "none";
 
-#expand    let ourmstone = "__MOZ_APP_VERSION__";
+  let ourmstone = Services.appinfo.platformVersion;
 
   if (ourmstone != savedmstone) {
     Services.prefs.setCharPref("browser.startup.homepage_override.mstone", ourmstone);
 
     return (savedmstone ? "new version" : "new profile");
   }
 
   return "none";
@@ -217,16 +217,21 @@ BrowserCLH.prototype = {
         return;
       }
 
       browserWin = Services.wm.getMostRecentWindow("navigator:browser");
       if (!browserWin) {
         // Default to the saved homepage
         let defaultURL = getHomePage();
 
+        // Show page for first run or upgrade.
+        if (needHomepageOverride() == "new profile") {
+          defaultURL = 'about:newtab?firstrun';
+        }
+
         // Override the default if we have a URL passed on command line
         if (uris.length > 0) {
           defaultURL = uris[0].spec;
           uris = uris.slice(1);
         }
 
         // Show the locale selector if we have a new profile, or if the selected locale is no longer compatible
         let showLocalePicker = Services.prefs.getBoolPref("browser.firstrun.show.localepicker");