diff --git a/mozilla/extensions/xforms/Makefile.in b/mozilla/extensions/xforms/Makefile.in
index fd1c4ab83a0..018b13b1b8b 100644
--- a/mozilla/extensions/xforms/Makefile.in
+++ b/mozilla/extensions/xforms/Makefile.in
@@ -84,7 +84,7 @@ CPPSRCS		= \
 		nsXFormsUtils.cpp \
 		nsXFormsModelElement.cpp \
 		nsXFormsInputElement.cpp \
- 		nsXFormsGroupElement.cpp \
+		nsXFormsGroupElement.cpp \
 		nsXFormsOutputElement.cpp \
 		nsXFormsRepeatElement.cpp \
 		nsXFormsRepeatItemElement.cpp \
@@ -123,3 +123,11 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
+libs:: xforms.css
+	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	$^ > $(DIST)/bin/res/xforms.css
+
+install:: xforms.css
+	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	$^ > $(DESTDIR)$(mozappdir)/res/xforms.css
diff --git a/mozilla/extensions/xforms/nsXFormsModule.cpp b/mozilla/extensions/xforms/nsXFormsModule.cpp
index ccdc27f225f..24e4c78a9a1 100644
--- a/mozilla/extensions/xforms/nsXFormsModule.cpp
+++ b/mozilla/extensions/xforms/nsXFormsModule.cpp
@@ -44,6 +44,42 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsXFormsElementFactory)
 
+static NS_IMETHODIMP
+RegisterXFormsModule(nsIComponentManager *aCompMgr,
+                     nsIFile *aPath,
+                     const char *aRegistryLocation,
+                     const char *aComponentType,
+                     const nsModuleComponentInfo *aInfo)
+{
+  nsCOMPtr<nsICategoryManager> catman =
+    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
+
+  if (!catman)
+    return NS_ERROR_FAILURE;
+
+  nsXPIDLCString previous;
+  return catman->AddCategoryEntry("agent-style-sheets",
+                                  "xforms stylesheet",
+                                  "resource://gre/res/xforms.css",
+                                  PR_TRUE, PR_TRUE, getter_Copies(previous));
+}
+
+static NS_IMETHODIMP
+UnregisterXFormsModule(nsIComponentManager *aCompMgr,
+                       nsIFile *aPath,
+                       const char *aRegistryLocation,
+                       const nsModuleComponentInfo *aInfo)
+{
+  nsCOMPtr<nsICategoryManager> catman =
+    do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
+
+  if (!catman)
+    return NS_ERROR_FAILURE;
+
+  return catman->DeleteCategoryEntry("agent-style-sheets",
+                                     "xforms stylesheet", PR_TRUE);
+}
+
 static const nsModuleComponentInfo components[] = {
   { "XForms element factory",
     NS_XFORMSELEMENTFACTORY_CID,
diff --git a/mozilla/extensions/xforms/xforms.css b/mozilla/extensions/xforms/xforms.css
new file mode 100755
index 00000000000..21b759dff2b
--- /dev/null
+++ b/mozilla/extensions/xforms/xforms.css
@@ -0,0 +1,44 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla XForms support.
+#
+# The Initial Developer of the Original Code is
+# IBM Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+@namespace url(http://www.w3.org/2002/xforms);
+repeat,
+repeatitem,
+contextcontainer,
+group,
+switch,
+case {
+  display: block;
+}