diff --git a/mozilla/profile/public/Makefile.in b/mozilla/profile/public/Makefile.in
index 05619532844..44d65c75951 100644
--- a/mozilla/profile/public/Makefile.in
+++ b/mozilla/profile/public/Makefile.in
@@ -37,6 +37,7 @@ SDK_XPIDLSRCS	= \
 XPIDLSRCS	= \
 		nsIProfileInternal.idl \
 		nsIProfileStartupListener.idl \
+	        nsISessionRoaming.idl \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/mozilla/profile/public/nsISessionRoaming.idl b/mozilla/profile/public/nsISessionRoaming.idl
new file mode 100644
index 00000000000..e82896ce252
--- /dev/null
+++ b/mozilla/profile/public/nsISessionRoaming.idl
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Roaming code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Ben Bucksch <http://www.bucksch.org> of
+ * Beonex <http://www.beonex.com>
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ * Or maybe not. I believe that interfaces should be free ;-).
+ *
+ * Contributor(s):
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+#include "nsIFile.idl"
+
+/**
+ * nsISessionRoaming
+ *
+ * Implementation should be a service.
+ *
+ * see extensions/sraoming/README.txt
+ * 
+ * @status EXPERIMENTAL
+ * @version 1.0
+ */
+
+[scriptable, uuid(ab62465c-494c-446e-b671-930bb98a7bc4)]
+interface nsISessionRoaming : nsISupports {
+    void BeginSession(); 
+    void EndSession(); 
+    boolean isRoaming();                  // should be here?
+};
diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index a4c924eb8d8..e7148dda392 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -80,6 +80,7 @@
 #include "nsHashtable.h"
 #include "nsIAtom.h"
 #include "nsProfileDirServiceProvider.h"
+#include "nsISessionRoaming.h"
 
 // Interfaces Needed
 #include "nsIDocShell.h"
@@ -156,6 +157,7 @@ static nsProfileDirServiceProvider *gDirServiceProvider = nsnull;
 static NS_DEFINE_CID(kPrefMigrationCID, NS_PREFMIGRATION_CID);
 static NS_DEFINE_CID(kPrefConverterCID, NS_PREFCONVERTER_CID);
 
+#define NS_SESSIONROAMING_CONTRACTID "@mozilla.org/profile/session-roaming;1"
 
 
 /*
@@ -1258,6 +1260,13 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile)
           return NS_ERROR_ABORT;
     }
 
+    // Roaming download
+    // Tolerate errors. Maybe the roaming extension isn't installed.
+    nsCOMPtr <nsISessionRoaming> roam =
+      do_GetService(NS_SESSIONROAMING_CONTRACTID, &rv);
+    if (NS_SUCCEEDED(rv))
+      roam->BeginSession();
+
     // Phase 4: Notify observers that the profile has changed - Here they respond to new profile
     observerService->NotifyObservers(subject, "profile-do-change", context.get());
     if (mProfileChangeFailed)
@@ -1344,6 +1353,13 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType)
       observerService->NotifyObservers(subject, "profile-before-change", context.get());        
     }
 
+    // Roaming upload
+    // Tolerate errors. Maybe the roaming extension isn't installed.
+    nsCOMPtr <nsISessionRoaming> roam =
+      do_GetService(NS_SESSIONROAMING_CONTRACTID, &rv);
+    if (NS_SUCCEEDED(rv))
+      roam->EndSession();
+
     gDirServiceProvider->SetProfileDir(nsnull);
     UpdateCurrentProfileModTime(PR_TRUE);
     mCurrentProfileAvailable = PR_FALSE;