diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm
index 2cbfaca3fa2..9777d6d7539 100644
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@@ -609,7 +609,6 @@ sub ProcessJarManifests()
     CreateJarFromManifest(":mozilla:extensions:wallet:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:intl:uconv:src:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:htmlparser:src:jar.mn", $chrome_dir, \%jars);
-    CreateJarFromManifest(":mozilla:layout:html:forms:resources:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:layout:html:document:src:xbl-marquee:resources:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:layout:html:forms:src:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:layout:html:base:src:jar.mn", $chrome_dir, \%jars);
diff --git a/layout/html/forms/Makefile.in b/layout/html/forms/Makefile.in
index 3b2782aea7e..8e79579887a 100644
--- a/layout/html/forms/Makefile.in
+++ b/layout/html/forms/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public resources src
+DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst
index 80457db4f49..8fa8c457a3c 100644
--- a/xpinstall/packager/mac/browser.jst
+++ b/xpinstall/packager/mac/browser.jst
@@ -81,8 +81,6 @@ if (verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/necko/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/mozldap/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf, "forms.jar"),"content/forms/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder(cf, "forms.jar"),"skin/classic/forms/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/");
diff --git a/xpinstall/packager/mac/langenus.jst b/xpinstall/packager/mac/langenus.jst
index 0dc34b6188a..486ece81cc5 100644
--- a/xpinstall/packager/mac/langenus.jst
+++ b/xpinstall/packager/mac/langenus.jst
@@ -69,7 +69,6 @@ if (verifyDiskSpace(fProgram, srDest))
         registerChrome(chromeType, cf, localeName + "help/");
         registerChrome(chromeType, cf, localeName + "pippki/");
         registerChrome(chromeType, cf, localeName + "pipnss/");
-        registerChrome(chromeType, cf, localeName + "forms/");
 
         registerChrome(chromeType, pf, localeName + "global-platform/");
         registerChrome(chromeType, pf, localeName + "communicator-platform/");
diff --git a/xpinstall/packager/os2/browser.jst b/xpinstall/packager/os2/browser.jst
index 9b06433bfcf..bb678301f5b 100644
--- a/xpinstall/packager/os2/browser.jst
+++ b/xpinstall/packager/os2/browser.jst
@@ -77,8 +77,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-region/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/necko/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/mozldap/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"content/forms/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"skin/classic/forms/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/global/");
diff --git a/xpinstall/packager/os2/langenus.jst b/xpinstall/packager/os2/langenus.jst
index d896cea1356..8dc3f1119f8 100644
--- a/xpinstall/packager/os2/langenus.jst
+++ b/xpinstall/packager/os2/langenus.jst
@@ -73,7 +73,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "help/");
     registerChrome(chromeType, cf, localeName + "pippki/");
     registerChrome(chromeType, cf, localeName + "pipnss/");
-    registerChrome(chromeType, cf, localeName + "forms/");
 
     registerChrome(chromeType, pf, localeName + "global-platform/");
     registerChrome(chromeType, pf, localeName + "communicator-platform/");
diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac
index e2989585f5a..854e0c0bb65 100644
--- a/xpinstall/packager/packages-mac
+++ b/xpinstall/packager/packages-mac
@@ -233,7 +233,6 @@ viewer:chrome:help.jar
 viewer:chrome:comm.jar
 viewer:chrome:content-packs.jar
 viewer:chrome:toolkit.jar
-viewer:chrome:forms.jar
 viewer:chrome:modern.jar
 viewer:chrome:classic.jar
 viewer:chrome:pippki.jar
diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2
index ab522cedc7e..7ff4286de8c 100644
--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -281,7 +281,6 @@ bin/chrome/help.jar
 bin/chrome/comm.jar
 bin/chrome/content-packs.jar
 bin/chrome/toolkit.jar
-bin/chrome/forms.jar
 bin/chrome/modern.jar
 bin/chrome/classic.jar
 bin/chrome/chromelist.txt
diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix
index 79d5902f718..3624d66bfb9 100644
--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@@ -182,7 +182,6 @@ bin/chrome/help.jar
 bin/chrome/toolkit.jar
 bin/chrome/comm.jar
 bin/chrome/content-packs.jar
-bin/chrome/forms.jar
 bin/chrome/modern.jar
 bin/chrome/classic.jar
 bin/chrome/installed-chrome.txt
diff --git a/xpinstall/packager/packages-static-win b/xpinstall/packager/packages-static-win
index e64022abccc..9b4e61d4a95 100644
--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@@ -200,7 +200,6 @@ bin\chrome\help.jar
 bin\chrome\comm.jar
 bin\chrome\content-packs.jar
 bin\chrome\toolkit.jar
-bin\chrome\forms.jar
 bin\chrome\modern.jar
 bin\chrome\classic.jar
 bin\chrome\comm\*
diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix
index 142bfbb437d..e08d4a75b57 100644
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -250,7 +250,6 @@ bin/chrome/help.jar
 bin/chrome/toolkit.jar
 bin/chrome/comm.jar
 bin/chrome/content-packs.jar
-bin/chrome/forms.jar
 bin/chrome/modern.jar
 bin/chrome/classic.jar
 bin/chrome/installed-chrome.txt
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index 916d709b9e0..8162a313525 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -263,7 +263,6 @@ bin\chrome\help.jar
 bin\chrome\comm.jar
 bin\chrome\content-packs.jar
 bin\chrome\toolkit.jar
-bin\chrome\forms.jar
 bin\chrome\modern.jar
 bin\chrome\classic.jar
 bin\chrome\comm\*
diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst
index 9727362955d..ec887221247 100644
--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@@ -86,8 +86,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/necko/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/mozldap/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"forms.jar"),"content/forms/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"forms.jar"),"skin/classic/forms/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/");
diff --git a/xpinstall/packager/unix/langenus.jst b/xpinstall/packager/unix/langenus.jst
index a13087bc4f0..f2eed2822ab 100644
--- a/xpinstall/packager/unix/langenus.jst
+++ b/xpinstall/packager/unix/langenus.jst
@@ -72,7 +72,6 @@ if (verifyDiskSpace(fProgram, srDest))
         registerChrome(chromeType, cf, localeName + "net2phone/");
         registerChrome(chromeType, cf, localeName + "pipnss/");
         registerChrome(chromeType, cf, localeName + "pippki/");
-        registerChrome(chromeType, cf, localeName + "forms/");
 
         registerChrome(chromeType, pf, localeName + "global-platform/");
         registerChrome(chromeType, pf, localeName + "communicator-platform/");
diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst
index 6c1c510ccf4..c64c42226aa 100644
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@@ -493,8 +493,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-region/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/necko/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/mozldap/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"content/forms/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","forms.jar"),"skin/classic/forms/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/global/");
diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst
index de900696023..6980b3b0e60 100644
--- a/xpinstall/packager/windows/langenus.jst
+++ b/xpinstall/packager/windows/langenus.jst
@@ -70,7 +70,6 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "help/");
     registerChrome(chromeType, cf, localeName + "pippki/");
     registerChrome(chromeType, cf, localeName + "pipnss/");
-    registerChrome(chromeType, cf, localeName + "forms/");
 
     registerChrome(chromeType, pf, localeName + "global-platform/");
     registerChrome(chromeType, pf, localeName + "communicator-platform/");