diff --git a/mozilla/cmd/winfe/fegui.cpp b/mozilla/cmd/winfe/fegui.cpp
index 690aee00554..f2fb924291e 100755
--- a/mozilla/cmd/winfe/fegui.cpp
+++ b/mozilla/cmd/winfe/fegui.cpp
@@ -1114,7 +1114,7 @@ xp_FileName(const char * name, XP_FileType type, char* *myName)
 	case xpGlobalHistory:
 		newName = (char *) XP_ALLOC(_MAX_PATH);
 		// changed -- jonm to support multi-profile
-		sprintf(newName, "%s\\mozilla.hst", (const char *)theApp.m_UserDirectory);
+		sprintf(newName, "%s\\%s.hst", (const char *)theApp.m_UserDirectory, XP_AppName);
 		break;
     case xpGlobalHistoryList:
         newName = (char *) XP_ALLOC(_MAX_PATH);
diff --git a/mozilla/cmd/winfe/logindg.cpp b/mozilla/cmd/winfe/logindg.cpp
index 5ada9b0497b..4bc298a1a9a 100644
--- a/mozilla/cmd/winfe/logindg.cpp
+++ b/mozilla/cmd/winfe/logindg.cpp
@@ -2050,10 +2050,11 @@ int     login_UpdateFilesToNewLocation(const char * path,CWnd *pParent,BOOL bCop
 	}
 
 	CString csHist = theApp.GetProfileString("History","History File","");
+	CString csFilename = CString(XP_AppName) + ".hst";
 	if (!csHist.IsEmpty()) {
 		csTmp = path;
-		csTmp += "\\mozilla.hst";
-		pDlg->StartFileUpdate("General Files","mozilla.hst");
+		csTmp += CString("\\") + csFilename;
+		pDlg->StartFileUpdate("General Files", (char*)(const char*)csFilename);
 		if (bCopyDontMove) {
 			WFE_CopyFile(csHist,csTmp);
 		} else {
@@ -2063,8 +2064,8 @@ int     login_UpdateFilesToNewLocation(const char * path,CWnd *pParent,BOOL bCop
 	} else {
 		if (!csMain.IsEmpty()) {
 			csTmp = path;
-			csTmp += "\\mozilla.hst";
-			pDlg->StartFileUpdate("General Files","mozilla.hst");
+			csTmp += CString("\\") + csFilename;
+			pDlg->StartFileUpdate("General Files",(char*)(const char*)csFilename);
 			WFE_CopyFile(csMain + "\\mozilla.hst" ,csTmp);
 		}
 	}