diff --git a/mozilla/extensions/xforms/Makefile.in b/mozilla/extensions/xforms/Makefile.in
index 5b496a65317..e5e6118c6ea 100644
--- a/mozilla/extensions/xforms/Makefile.in
+++ b/mozilla/extensions/xforms/Makefile.in
@@ -134,11 +134,3 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
-
-libs::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
-	$(srcdir)/xforms.css > $(DIST)/bin/res/xforms.css
-
-install::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
-	$(srcdir)/xforms.css > $(DESTDIR)$(mozappdir)/res/xforms.css
diff --git a/mozilla/extensions/xforms/contents.rdf b/mozilla/extensions/xforms/contents.rdf
new file mode 100755
index 00000000000..05d79dfdfe3
--- /dev/null
+++ b/mozilla/extensions/xforms/contents.rdf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:xforms"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:xforms"
+                   chrome:name="xforms"/>
+</RDF:RDF>
diff --git a/mozilla/extensions/xforms/jar.mn b/mozilla/extensions/xforms/jar.mn
new file mode 100755
index 00000000000..054b3e0b219
--- /dev/null
+++ b/mozilla/extensions/xforms/jar.mn
@@ -0,0 +1,3 @@
+xforms.jar:
+	content/xforms/contents.rdf
+*	content/xforms/xforms.css
diff --git a/mozilla/extensions/xforms/nsXFormsModule.cpp b/mozilla/extensions/xforms/nsXFormsModule.cpp
index af1b7ea311e..5fffe8c3cff 100644
--- a/mozilla/extensions/xforms/nsXFormsModule.cpp
+++ b/mozilla/extensions/xforms/nsXFormsModule.cpp
@@ -62,7 +62,7 @@ RegisterXFormsModule(nsIComponentManager *aCompMgr,
   nsXPIDLCString previous;
   return catman->AddCategoryEntry("agent-style-sheets",
                                   "xforms stylesheet",
-                                  "resource://gre/res/xforms.css",
+                                  "chrome://xforms/content/xforms.css",
                                   PR_TRUE, PR_TRUE, getter_Copies(previous));
 }
 
@@ -86,7 +86,10 @@ static const nsModuleComponentInfo components[] = {
   { "XForms element factory",
     NS_XFORMSELEMENTFACTORY_CID,
     NS_XTF_ELEMENT_FACTORY_CONTRACTID_PREFIX NS_NAMESPACE_XFORMS,
-    nsXFormsElementFactoryConstructor }
+    nsXFormsElementFactoryConstructor,
+    RegisterXFormsModule,
+    UnregisterXFormsModule
+  }
 };
 
 PR_STATIC_CALLBACK(nsresult)