diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index fe72fb8dbd8..cb3e47e8fa2 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -85,6 +85,7 @@ dom/public/idl/range/Makefile
 dom/public/idl/stylesheets/Makefile
 dom/public/idl/views/Makefile
 dom/public/idl/xbl/Makefile
+dom/public/idl/xpath/Makefile
 dom/public/idl/xul/Makefile
 dom/src/Makefile
 dom/src/base/Makefile
diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
index 5c69649eb47..c5b73e020ee 100644
--- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm
+++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
@@ -731,6 +731,7 @@ sub BuildClientDist()
     InstallFromManifest(":mozilla:dom:public:idl:stylesheets:MANIFEST_IDL",        "$distdirectory:idl:");
     InstallFromManifest(":mozilla:dom:public:idl:views:MANIFEST_IDL",              "$distdirectory:idl:");
     InstallFromManifest(":mozilla:dom:public:idl:xbl:MANIFEST_IDL",                "$distdirectory:idl:");
+    InstallFromManifest(":mozilla:dom:public:idl:xpath:MANIFEST_IDL",              "$distdirectory:idl:");
     InstallFromManifest(":mozilla:dom:public:idl:xul:MANIFEST_IDL",                "$distdirectory:idl:");
     
     # SVG
@@ -1112,6 +1113,7 @@ sub BuildIDLProjects()
     BuildIDLProject(":mozilla:dom:macbuild:dom_stylesheetsIDL.xml",                 "dom_stylesheets");
     BuildIDLProject(":mozilla:dom:macbuild:dom_viewsIDL.xml",                       "dom_views");
     BuildIDLProject(":mozilla:dom:macbuild:dom_xblIDL.xml",                         "dom_xbl");
+    BuildIDLProject(":mozilla:dom:macbuild:dom_xpathIDL.xml",                       "dom_xpath");
     BuildIDLProject(":mozilla:dom:macbuild:dom_xulIDL.xml",                         "dom_xul");
 
 	if ($main::options{svg}) {
diff --git a/mozilla/dom/public/idl/Makefile.in b/mozilla/dom/public/idl/Makefile.in
index c484fd5c07e..b616de003ce 100644
--- a/mozilla/dom/public/idl/Makefile.in
+++ b/mozilla/dom/public/idl/Makefile.in
@@ -37,6 +37,7 @@ DIRS =						\
 	traversal				\
 	range					\
 	xbl					\
+	xpath					\
 	xul
 
 ifdef MOZ_SVG
diff --git a/mozilla/dom/public/idl/makefile.win b/mozilla/dom/public/idl/makefile.win
index ce1e0bb4ef9..2339124a475 100644
--- a/mozilla/dom/public/idl/makefile.win
+++ b/mozilla/dom/public/idl/makefile.win
@@ -33,6 +33,7 @@ DIRS=						\
 	traversal				\
 	range					\
 	xbl					\
+	xpath					\
 !ifdef MOZ_SVG
 	svg					\
 !endif
diff --git a/mozilla/xpcom/base/nsError.h b/mozilla/xpcom/base/nsError.h
index 003f8382b55..5b7e7b72e9f 100644
--- a/mozilla/xpcom/base/nsError.h
+++ b/mozilla/xpcom/base/nsError.h
@@ -86,6 +86,7 @@
 #define NS_ERROR_MODULE_PROFILE    19
 #define NS_ERROR_MODULE_LDAP       20
 #define NS_ERROR_MODULE_SECURITY   21
+#define NS_ERROR_MODULE_DOM_XPATH  22
 // NS_ERROR_MODULE_GENERAL should be used by modules that don't
 // care if return code values overlap. Callers of methods that
 // return such codes should be aware that they are not