diff --git a/mozilla/cck/driver/cck.che b/mozilla/cck/driver/cck.che
index 0ef4e01bea9..ba1237adc6a 100644
--- a/mozilla/cck/driver/cck.che
+++ b/mozilla/cck/driver/cck.che
@@ -12,7 +12,6 @@ CompanyName=
 HomePageURL=http://home.netscape.com
 HelpMenuCommandName=
 HelpMenuCommandURL=
-CustomBookmarkFile=%Root%Configs\Default\Workspace\Bkmarks\bookmarks.html
 ProgramFolderName=
 CreateReadmeIcon=0
 CreateLicenseIcon=0
diff --git a/mozilla/cck/ib/script_Mac OS.ib b/mozilla/cck/ib/script_Mac OS.ib
index 0eb9e1b48b8..7c9d205425a 100644
--- a/mozilla/cck/ib/script_Mac OS.ib	
+++ b/mozilla/cck/ib/script_Mac OS.ib	
@@ -6,10 +6,10 @@ replaceXPI(ChromeDefaults.zip,chrome/modern.jar,skin/modern/communicator/brand/t
 replaceXPI(ChromeDefaults.zip,chrome/modern.jar,skin/modern/communicator/brand/throbber-single.gif,%LargeStillPath%)
 replaceXPI(ChromeDefaults.zip,chrome/modern.jar,skin/modern/communicator/brand/throbber16-anim.gif,%LargeAnimPath%)
 replaceXPI(ChromeDefaults.zip,chrome/modern.jar,skin/modern/communicator/brand/throbber16-single.gif,%LargeStillPath%)
-replaceXPI(ChromeDefaults.zip,no.jar,defaults/profile/bookmarks.html,%CustomBookmarkFile%)
-replaceXPI(ChromeDefaults.zip,no.jar,defaults/profile/%REGION%/bookmarks.html,%CustomBookmarkFile%)
 modifySidebar(ChromeDefaults.zip,no.jar,bin/defaults/profile/panels.rdf)
 modifySidebar(ChromeDefaults.zip,no.jar,bin/defaults/profile/%REGION%/panels.rdf)
+modifyBookmarks(ChromeDefaults.zip,no.jar,defaults/profile/bookmarks.html)
+modifyBookmarks(ChromeDefaults.zip,no.jar,defaults/profile/%REGION%/bookmarks.html)
 replaceXPI(ChromeDefaults.zip,chrome/comm.jar,content/communicator/communicatorOverlay.xul,%HlpRDF%)
 modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator-title.dtd,mainWindow.titlemodifier,%CompanyName%)
 modifyProperties(ChromeDefaults.zip,chrome/%REGION%.jar,locale/%REGION%/navigator-region/region.properties,browser.startup.homepage,%HomePageURL%)
diff --git a/mozilla/cck/ib/script_Windows.ib b/mozilla/cck/ib/script_Windows.ib
index 306ceb2c294..6b21a68b52b 100644
--- a/mozilla/cck/ib/script_Windows.ib
+++ b/mozilla/cck/ib/script_Windows.ib
@@ -14,10 +14,10 @@ replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/thro
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber-single.gif,%LargeStillPath%)
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber16-anim.gif,%LargeAnimPath%)
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber16-single.gif,%LargeStillPath%)
-replaceXPI(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/bookmarks.html,%CustomBookmarkFile%)
-replaceXPI(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/bookmarks.html,%CustomBookmarkFile%)
 modifySidebar(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/panels.rdf)
 modifySidebar(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/panels.rdf)
+modifyBookmarks(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/bookmarks.html)
+modifyBookmarks(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/bookmarks.html)
 replaceXPI(browser.xpi,bin/chrome/comm.jar,content/communicator/communicatorOverlay.xul,%HlpRDF%)
 modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator-title.dtd,mainWindow.titlemodifier,%CompanyName%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/navigator-region/region.properties,browser.startup.homepage,%HomePageURL%)
diff --git a/mozilla/cck/ib/script_linux.ib b/mozilla/cck/ib/script_linux.ib
index 1190f4a926e..7aab763f43e 100644
--- a/mozilla/cck/ib/script_linux.ib
+++ b/mozilla/cck/ib/script_linux.ib
@@ -6,10 +6,10 @@ replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/thro
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber-single.gif,%LargeStillPath%)
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber16-anim.gif,%LargeAnimPath%)
 replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/communicator/brand/throbber16-single.gif,%LargeStillPath%)
-replaceXPI(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/bookmarks.html,%CustomBookmarkFile%)
-replaceXPI(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/bookmarks.html,%CustomBookmarkFile%)
 modifySidebar(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/panels.rdf)
 modifySidebar(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/panels.rdf)
+modifyBookmarks(defl%lang%%region%.xpi,no.jar,bin/defaults/profile/bookmarks.html)
+modifyBookmarks(reg%region%.xpi,no.jar,bin/defaults/profile/%REGION%/bookmarks.html)
 replaceXPI(browser.xpi,bin/chrome/comm.jar,content/communicator/communicatorOverlay.xul,%HlpRDF%)
 modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator-title.dtd,mainWindow.titlemodifier,%CompanyName%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/navigator-region/region.properties,browser.startup.homepage,%HomePageURL%)
diff --git a/mozilla/cck/wizard/wizard.cpp b/mozilla/cck/wizard/wizard.cpp
index 5c569c5bdb1..3b494800712 100644
--- a/mozilla/cck/wizard/wizard.cpp
+++ b/mozilla/cck/wizard/wizard.cpp
@@ -77,7 +77,6 @@ BOOL Config(CString globalsName, CString DialogTitle, WIDGET* curWidget)
 	SetGlobal("LargeAnimPath", newDir + "\\Workspace\\AnimLogo\\animlogo32.gif");
 	SetGlobal("LargeStillPath", newDir + "\\Workspace\\AnimLogo\\staticlogo32.gif");
 	SetGlobal("ReadMeFile", newDir + "\\Workspace\\readme.txt");
-	SetGlobal("CustomBookmarkFile", newDir + "\\Workspace\\Bkmarks\\bookmarks.html");
 	SetGlobal("ShellBgBitmap", newDir + "\\Workspace\\Autorun\\Shell\\bmps\\install.bmp");
 	SetGlobal("ShellInstallTextFile", newDir + "\\Workspace\\Autorun\\install.txt");