diff --git a/xpinstall/packager/common/share.t b/xpinstall/packager/common/share.t
index 01568abbddf6..53c34cc4879d 100644
--- a/xpinstall/packager/common/share.t
+++ b/xpinstall/packager/common/share.t
@@ -53,3 +53,40 @@ function deleteThisFolder(dirKey, folder)
     return(false);
 }
 
+// OS type detection
+// which platform?
+function getPlatform()
+{
+  var platformStr;
+  var platformNode;
+
+  if('platform' in Install)
+  {
+    platformStr = new String(Install.platform);
+
+    if (!platformStr.search(/^Macintosh/))
+      platformNode = 'mac';
+    else if (!platformStr.search(/^Win/))
+      platformNode = 'win';
+    else
+      platformNode = 'unix';
+  }
+  else
+  {
+    var fOSMac  = getFolder("Mac System");
+    var fOSWin  = getFolder("Win System");
+
+    logComment("fOSMac: "  + fOSMac);
+    logComment("fOSWin: "  + fOSWin);
+
+    if(fOSMac != null)
+      platformNode = 'mac';
+    else if(fOSWin != null)
+      platformNode = 'win';
+    else
+      platformNode = 'unix';
+  }
+
+  return platformNode;
+}
+
diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst
index e5a4431eedfa..adeae9a3f295 100644
--- a/xpinstall/packager/mac/browser.jst
+++ b/xpinstall/packager/mac/browser.jst
@@ -2,7 +2,6 @@ function upgradeCleanup()
 {
   // Obsolete files from Netscape 6.0 and Netscape 6.01 that
   // need to be cleaned up.
-  deleteThisFile("Components", "browser.xpt");
   deleteThisFile("Components", "DOMDataSource.shlb");
   deleteThisFile("Components", "PSMGlue.shlb");
   deleteThisFile("Components", "ucth.shlb");
diff --git a/xpinstall/packager/mac/langenus.jst b/xpinstall/packager/mac/langenus.jst
index 035addfe5501..ef99b39635e6 100644
--- a/xpinstall/packager/mac/langenus.jst
+++ b/xpinstall/packager/mac/langenus.jst
@@ -2,18 +2,9 @@ var srDest = $SpaceRequired$;
 
 var err;
 var fProgram;
-
-// OS type detection
-// which platform?
-var platformStr = new String(Install.platform);
 var platformNode;
-if (!platformStr.search(/^Macintosh/))
-    platformNode = 'mac';
-else if (!platformStr.search(/^Win/))
-    platformNode = 'win';
-else
-    platformNode = 'unix';
 
+platformNode = getPlatform();
 logComment("initInstall: platformNode=" + platformNode);
 // end
 // end - OS type detection
diff --git a/xpinstall/packager/mac/mail.jst b/xpinstall/packager/mac/mail.jst
index 57c85a876bc5..eea6baecb1e5 100644
--- a/xpinstall/packager/mac/mail.jst
+++ b/xpinstall/packager/mac/mail.jst
@@ -2,7 +2,6 @@ function upgradeCleanup()
 {
   // Obsolete files from Netscape 6.0 and Netscape 6.01 that
   // need to be cleaned up.
-  deleteThisFile("Components", "mail.xpt");
   deleteThisFile("Components", "signed.shlb");
 }
 
diff --git a/xpinstall/packager/unix/langenus.jst b/xpinstall/packager/unix/langenus.jst
index 15a77d2c4cc3..b3bd0e6d9ad3 100644
--- a/xpinstall/packager/unix/langenus.jst
+++ b/xpinstall/packager/unix/langenus.jst
@@ -1,18 +1,9 @@
 var srDest = $SpaceRequired$;
 var err;
 var fProgram;
-
-// OS type detection
-// which platform?
-var platformStr = new String(Install.platform);
 var platformNode;
-if (!platformStr.search(/^Macintosh/))
-    platformNode = 'mac';
-else if (!platformStr.search(/^Win/))
-    platformNode = 'win';
-else
-    platformNode = 'unix';
 
+platformNode = getPlatform();
 logComment("initInstall: platformNode=" + platformNode);
 // end
 // end - OS type detection
diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst
index eb6448e396df..f27fc5b942d8 100644
--- a/xpinstall/packager/windows/langenus.jst
+++ b/xpinstall/packager/windows/langenus.jst
@@ -2,18 +2,9 @@
 var srDest;
 var err;
 var fProgram;
-
-// OS type detection
-// which platform?
-var platformStr = new String(Install.platform);
 var platformNode;
-if (!platformStr.search(/^Macintosh/))
-    platformNode = 'mac';
-else if (!platformStr.search(/^Win/))
-    platformNode = 'win';
-else
-    platformNode = 'unix';
 
+platformNode = getPlatform();
 logComment("initInstall: platformNode=" + platformNode);
 // end
 // end - OS type detection
diff --git a/xpinstall/packager/windows/makeall.pl b/xpinstall/packager/windows/makeall.pl
index 2640d6c62af5..f8e4a0fa6a81 100644
--- a/xpinstall/packager/windows/makeall.pl
+++ b/xpinstall/packager/windows/makeall.pl
@@ -66,9 +66,9 @@ $seiFileNameSpecificStub  = "mozilla-win32-stub-installer.exe";
 $seuFileNameSpecific  = "MozillaUninstall.exe";
 
 # set environment vars for use by other .pl scripts called from this script.
-$ENV{WIZ_userAgent}            = "0.9.1 (en)"; # ie: "0.9 (en)"
-$ENV{WIZ_userAgentShort}       = "0.9.1";      # ie: "0.9"
-$ENV{WIZ_xpinstallVersion}     = "0.9.1";      # ie: "0.9.0"
+$ENV{WIZ_userAgent}            = "0.9.2 (en)"; # ie: "0.9 (en)"
+$ENV{WIZ_userAgentShort}       = "0.9.2";      # ie: "0.9"
+$ENV{WIZ_xpinstallVersion}     = "0.9.2";      # ie: "0.9.0"
 $ENV{WIZ_nameCompany}          = "mozilla.org";
 $ENV{WIZ_nameProduct}          = "Mozilla";
 $ENV{WIZ_fileMainExe}          = "Mozilla.exe";
diff --git a/xpinstall/packager/windows/psm.jst b/xpinstall/packager/windows/psm.jst
index 7959a7bf49fa..8e8dfd1fe288 100644
--- a/xpinstall/packager/windows/psm.jst
+++ b/xpinstall/packager/windows/psm.jst
@@ -2,6 +2,7 @@ function upgradeCleanup()
 {
   // Obsolete files from Netscape 6.0 and Netscape 6.01 that
   // need to be cleaned up.
+  deleteThisFile("Program",    "psm.exe");
   deleteThisFile("Components", "psmglue.dll");
 }