diff --git a/mozilla/extensions/xforms/Makefile.in b/mozilla/extensions/xforms/Makefile.in
index fd1c4ab83a0..1f435d39eb1 100644
--- a/mozilla/extensions/xforms/Makefile.in
+++ b/mozilla/extensions/xforms/Makefile.in
@@ -65,6 +65,7 @@ REQUIRES	= \
 		xpconnect \
 		js \
 		layout \
+		schemavalidation \
 		$(NULL)
 
 XPIDLSRCS	= \
@@ -118,6 +119,7 @@ CPPSRCS		= \
 		nsXFormsCaseElement.cpp \
 		nsXFormsSwitchElement.cpp \
 		nsXFormsUploadElement.cpp \
+		nsXFormsSchemaValidator.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
diff --git a/mozilla/extensions/xforms/nsXFormsSchemaValidator.cpp b/mozilla/extensions/xforms/nsXFormsSchemaValidator.cpp
new file mode 100644
index 00000000000..77edb01d0bc
--- /dev/null
+++ b/mozilla/extensions/xforms/nsXFormsSchemaValidator.cpp
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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 Schema Validation.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doron Rosenberg <doronr@us.ibm.com> (original author)
+ *
+ * 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 ***** */
+
+// XPCOM includes
+#include "nsIServiceManager.h"
+
+#include "nsISchemaValidator.h"
+#include "nsXFormsSchemaValidator.h"
+
+#define NS_SCHEMAVALIDATOR_CONTRACTID "@mozilla.org/schemavalidator;1"
+
+nsXFormsSchemaValidator::nsXFormsSchemaValidator()
+{
+  mSchemaValidator = do_GetService(NS_SCHEMAVALIDATOR_CONTRACTID);
+}
+
+nsresult nsXFormsSchemaValidator::LoadSchema(nsISchema* aSchema)
+{
+  NS_ENSURE_TRUE(mSchemaValidator, NS_ERROR_UNEXPECTED);
+
+  return mSchemaValidator->LoadSchema(aSchema);
+}
+
+PRBool nsXFormsSchemaValidator::ValidateString(const nsAString & aValue,
+  const nsAString & aType, const nsAString & aNamespace)
+{
+  PRBool isValid = PR_FALSE;
+
+  NS_ENSURE_TRUE(mSchemaValidator, isValid);
+  mSchemaValidator->ValidateString(aValue, aType, aNamespace, &isValid);
+
+  return isValid;
+}
+
+PRBool nsXFormsSchemaValidator::Validate(nsIDOMNode* aElement)
+{
+  PRBool isValid = PR_FALSE;
+
+  NS_ENSURE_TRUE(mSchemaValidator, isValid);
+  mSchemaValidator->Validate(aElement, &isValid);
+
+  return isValid;
+}
+
diff --git a/mozilla/extensions/xforms/nsXFormsSchemaValidator.h b/mozilla/extensions/xforms/nsXFormsSchemaValidator.h
new file mode 100644
index 00000000000..a77720f2f98
--- /dev/null
+++ b/mozilla/extensions/xforms/nsXFormsSchemaValidator.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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 Schema Validation.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doron Rosenberg <doronr@us.ibm.com> (original author)
+ *
+ * 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 ***** */
+
+#include "nsCOMPtr.h"
+#include "nsISchemaValidator.h"
+
+class nsXFormsSchemaValidator
+{
+public:
+
+  nsXFormsSchemaValidator();
+  ~nsXFormsSchemaValidator();
+
+  nsresult LoadSchema(nsISchema* aSchema);
+  PRBool ValidateString(const nsAString & aValue, const nsAString & aType,
+    const nsAString & aNamespace);
+  PRBool Validate(nsIDOMNode* aElement);
+
+protected:
+  nsCOMPtr<nsISchemaValidator> mSchemaValidator;
+};
+