    this._index = 0;
    if (aItems) {
      for (var i = 0; i < aItems.length; ++i) {
-@@ -1860,24 +1710,23 @@ UpdateService.prototype = {
+@@ -1860,24 +1721,23 @@ UpdateService.prototype = {
        return null;
  
      // Choose the newest of the available minor and major updates.

     LOG("Checker:getUpdateURL - update URL: " + url);
     return url;
   },
@@ -3265,17 +3101,17 @@ Downloader.prototype = {
         // We only need to explicitly show the prompt if this is a background
         // download, since otherwise some kind of UI is already visible and
         // that UI will notify.

         state = STATE_DOWNLOAD_FAILED;
 
         // TODO: use more informative error code here
diff -r 323e068142c4 toolkit/mozapps/update/updater/updater.cpp
--- a/toolkit/mozapps/update/updater/updater.cpp	Tue Feb 26 09:16:10 2013 -0500
+++ b/toolkit/mozapps/update/updater/updater.cpp	Tue Mar 12 11:41:21 2013 +0100
@@ -2248,16 +2248,17 @@ int NS_main(int argc, NS_tchar **argv)
       sBackgroundUpdate = true;
     } else if (NS_tstrstr(argv[3], NS_T("/replace"))) {
       // We're processing a request to replace a version of the application
       // with an updated version applied in the background.
       sReplaceRequest = true;
     }
   }
 
+  // TODO: Linux-only currently...
   if (sReplaceRequest) {
     // If we're attempting to replace the application, try to append to the
     // log generated when staging the background update.
     NS_tchar installDir[MAXPATHLEN];
     if (!GetInstallationDir(installDir)) {
       fprintf(stderr, "Could not get the installation directory\n");
       return 1;
     }
@@ -2265,17 +2266,17 @@ int NS_main(int argc, NS_tchar **argv)
 #ifdef XP_WIN
     NS_tchar* logDir = gSourcePath;
 #else
     NS_tchar logDir[MAXPATHLEN];
     NS_tsnprintf(logDir, sizeof(logDir)/sizeof(logDir[0]),
 #ifdef XP_MACOSX
                  NS_T("%s/Updated.app/Contents/MacOS/updates"),
 #else
-                 NS_T("%s/updated/updates"),
+                 NS_T("%s/updated/App/Firefox/updates"),
 #endif
                  installDir);
 #endif
 
     LogInitAppend(logDir, NS_T("last-update.log"), NS_T("update.log"));
   } else {
     LogInit(gSourcePath, NS_T("update.log"));
   }
diff -r 323e068142c4 toolkit/xre/nsUpdateDriver.cpp
--- a/toolkit/xre/nsUpdateDriver.cpp	Tue Feb 26 09:16:10 2013 -0500
+++ b/toolkit/xre/nsUpdateDriver.cpp	Tue Mar 12 11:41:21 2013 +0100
@@ -412,45 +412,42 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIF
 
   nsCAutoString updaterPath;
