diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
index 57a160029fc..dd5b2f43641 100644
--- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
+++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
@@ -86,10 +86,19 @@ static NS_DEFINE_CID(kGlobalHistoryCID, NS_GLOBALHISTORY_CID);
 #define OPERA_PREFERENCES_FILE_NAME NS_LITERAL_STRING("opera6.ini")
 #define OPERA_HISTORY_FILE_NAME NS_LITERAL_STRING("global.dat")
 #define OPERA_BOOKMARKS_FILE_NAME NS_LITERAL_STRING("opera6.adr")
+#elif defined (XP_BEOS)
+#define OPERA_PREFERENCES_FOLDER_NAME NS_LITERAL_STRING("Opera")
+#define OPERA_PREFERENCES_FILE_NAME NS_LITERAL_STRING("opera.ini")
+#define OPERA_HISTORY_FILE_NAME NS_LITERAL_STRING("global.dat")
+#define OPERA_BOOKMARKS_FILE_NAME NS_LITERAL_STRING("opera.adr")
 #else
 #error Need to define location of Opera Profile data.
 #endif
+
 #define OPERA_COOKIES_FILE_NAME NS_LITERAL_STRING("cookies4.dat")
+#ifdef XP_BEOS
+#define OPERA_COOKIES_FILE_NAME NS_LITERAL_STRING("cookies.dat")
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsBrowserProfileMigrator