diff --git a/mozilla/xpinstall/packager/mac/spellcheck.jst b/mozilla/xpinstall/packager/mac/spellcheck.jst
index 30861e9a204..223b5aaa97b 100755
--- a/mozilla/xpinstall/packager/mac/spellcheck.jst
+++ b/mozilla/xpinstall/packager/mac/spellcheck.jst
@@ -3,12 +3,17 @@ var srDest = $SpaceRequired$;
 var err = initInstall("Mozilla Myspell Spellchecker", "Spellchecker", "$Version$"); 
 logComment("initInstall: " + err);
 
-if (verifyDiskSpace(getFolder("Components"), srDest))
+fProgram  = getFolder("Program");
+logComment("fProgram: " + fProgram)
+
+if (verifyDiskSpace(fProgram, srDest))
 {
+    setPackageFolder(fProgram);
+
     addDirectory("Spellchecker",
             "$Version$",
-            "components",
-            getFolder("Components"),
+            "bin",
+            fProgram,
             "");
 
     if (err==SUCCESS)
diff --git a/mozilla/xpinstall/packager/os2/spellcheck.jst b/mozilla/xpinstall/packager/os2/spellcheck.jst
index 30861e9a204..223b5aaa97b 100755
--- a/mozilla/xpinstall/packager/os2/spellcheck.jst
+++ b/mozilla/xpinstall/packager/os2/spellcheck.jst
@@ -3,12 +3,17 @@ var srDest = $SpaceRequired$;
 var err = initInstall("Mozilla Myspell Spellchecker", "Spellchecker", "$Version$"); 
 logComment("initInstall: " + err);
 
-if (verifyDiskSpace(getFolder("Components"), srDest))
+fProgram  = getFolder("Program");
+logComment("fProgram: " + fProgram)
+
+if (verifyDiskSpace(fProgram, srDest))
 {
+    setPackageFolder(fProgram);
+
     addDirectory("Spellchecker",
             "$Version$",
-            "components",
-            getFolder("Components"),
+            "bin",
+            fProgram,
             "");
 
     if (err==SUCCESS)
diff --git a/mozilla/xpinstall/packager/unix/spellcheck.jst b/mozilla/xpinstall/packager/unix/spellcheck.jst
index 30861e9a204..223b5aaa97b 100755
--- a/mozilla/xpinstall/packager/unix/spellcheck.jst
+++ b/mozilla/xpinstall/packager/unix/spellcheck.jst
@@ -3,12 +3,17 @@ var srDest = $SpaceRequired$;
 var err = initInstall("Mozilla Myspell Spellchecker", "Spellchecker", "$Version$"); 
 logComment("initInstall: " + err);
 
-if (verifyDiskSpace(getFolder("Components"), srDest))
+fProgram  = getFolder("Program");
+logComment("fProgram: " + fProgram)
+
+if (verifyDiskSpace(fProgram, srDest))
 {
+    setPackageFolder(fProgram);
+
     addDirectory("Spellchecker",
             "$Version$",
-            "components",
-            getFolder("Components"),
+            "bin",
+            fProgram,
             "");
 
     if (err==SUCCESS)
diff --git a/mozilla/xpinstall/packager/windows/spellcheck.jst b/mozilla/xpinstall/packager/windows/spellcheck.jst
index 30861e9a204..223b5aaa97b 100644
--- a/mozilla/xpinstall/packager/windows/spellcheck.jst
+++ b/mozilla/xpinstall/packager/windows/spellcheck.jst
@@ -3,12 +3,17 @@ var srDest = $SpaceRequired$;
 var err = initInstall("Mozilla Myspell Spellchecker", "Spellchecker", "$Version$"); 
 logComment("initInstall: " + err);
 
-if (verifyDiskSpace(getFolder("Components"), srDest))
+fProgram  = getFolder("Program");
+logComment("fProgram: " + fProgram)
+
+if (verifyDiskSpace(fProgram, srDest))
 {
+    setPackageFolder(fProgram);
+
     addDirectory("Spellchecker",
             "$Version$",
-            "components",
-            getFolder("Components"),
+            "bin",
+            fProgram,
             "");
 
     if (err==SUCCESS)