diff --git a/mozilla/xpinstall/src/nsJSInstall.cpp b/mozilla/xpinstall/src/nsJSInstall.cpp
index 26f344a4b09..a942f173eee 100644
--- a/mozilla/xpinstall/src/nsJSInstall.cpp
+++ b/mozilla/xpinstall/src/nsJSInstall.cpp
@@ -54,15 +54,14 @@ extern JSClass FileOpClass;
 enum Install_slots 
 {
   INSTALL_PLATFORM        = -1,
-  INSTALL_BUILDID         = -2,
-  INSTALL_JARFILE         = -3,
-  INSTALL_ARCHIVE         = -4,
-  INSTALL_ARGUMENTS       = -5,
-  INSTALL_URL             = -6,
-  INSTALL_FLAGS           = -7,
-  INSTALL_STATUSSENT      = -8,
-  INSTALL_INSTALL         = -9,
-  INSTALL_INSTALLED_FILES = -10
+  INSTALL_JARFILE         = -2,
+  INSTALL_ARCHIVE         = -3,
+  INSTALL_ARGUMENTS       = -4,
+  INSTALL_URL             = -5,
+  INSTALL_FLAGS           = -6,
+  INSTALL_STATUSSENT      = -7,
+  INSTALL_INSTALL         = -8,
+  INSTALL_INSTALLED_FILES = -9
 };
 
 // prototype for fileOp object
@@ -98,10 +97,6 @@ GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         break;
       }
 
-      case INSTALL_BUILDID:
-        *vp = INT_TO_JSVAL(NS_BUILD_ID);
-        break;
-
       case INSTALL_ARCHIVE:
       case INSTALL_JARFILE:
       {
@@ -1706,7 +1701,6 @@ JSClass InstallClass = {
 static JSPropertySpec InstallProperties[] =
 {
   {"platform",          INSTALL_PLATFORM,           JSPROP_ENUMERATE | JSPROP_READONLY},
-  {"buildID",           INSTALL_BUILDID,            JSPROP_ENUMERATE | JSPROP_READONLY},
   {"jarfile",           INSTALL_JARFILE,            JSPROP_ENUMERATE | JSPROP_READONLY},
   {"archive",           INSTALL_ARCHIVE,            JSPROP_ENUMERATE | JSPROP_READONLY},
   {"arguments",         INSTALL_ARGUMENTS,          JSPROP_ENUMERATE | JSPROP_READONLY},
@@ -1781,6 +1775,8 @@ static JSConstDoubleSpec install_constants[] =
     { CHROME_DELAYED,                        "DELAYED_CHROME"               },
     { CHROME_SELECT,                         "SELECT_CHROME"                },
 
+    { NS_BUILD_ID,                           "buildID"                      },
+
     {0}
 };
 
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
index b3453a1f075..248c89336f3 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
@@ -433,7 +433,7 @@ nsSoftwareUpdate::StartupTasks( PRBool *needAutoreg )
 
     // Also check for build number changes
     nsresult rv;
-    PRInt32 buildID = 0;
+    PRInt32 buildID = -1;
     nsRegistryKey idKey = 0;
     nsCOMPtr<nsIRegistry> reg = do_GetService(knsRegistryCID,&rv);
     if (NS_SUCCEEDED(rv))
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp
index 8b921024b17..efb4c7fd958 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.cpp
+++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp
@@ -63,7 +63,6 @@
 #include "nsIScriptGlobalObject.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
 static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);