diff --git a/src/xercesc/com/IXMLDOMNodeImpl.h b/src/xercesc/com/IXMLDOMNodeImpl.h
index 9ad3763c02e52b867ece23381139a7d1ae243bd5..a80175c1c3ea5e2b416974de2dfc7c6041c4c161 100644
--- a/src/xercesc/com/IXMLDOMNodeImpl.h
+++ b/src/xercesc/com/IXMLDOMNodeImpl.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.7  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.6  2004/09/08 13:55:35  peiyongz
  * Apache License Version 2.0
  *
@@ -80,7 +83,7 @@ XERCES_CPP_NAMESPACE_USE
 
 template <class T, const IID* piid, class tihclass = CComTypeInfoHolder>
 class ATL_NO_VTABLE IXMLDOMNodeImpl:
-	public IDispatchImpl<T,piid,&LIBID_Xerces, 2, 50,tihclass>,
+	public IDispatchImpl<T,piid,&LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION),tihclass>,
 	public IIBMXMLDOMNodeIdentity,
 	public ISupportErrorInfo
 {
diff --git a/src/xercesc/com/XMLDOMDocument.h b/src/xercesc/com/XMLDOMDocument.h
index 794a14a8facb02cad8e5c66d6cd0db3d77a2e12a..57c3c7307cbd6d44db169e85480a001cb424d8c7 100644
--- a/src/xercesc/com/XMLDOMDocument.h
+++ b/src/xercesc/com/XMLDOMDocument.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.10  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.9  2004/09/08 13:55:35  peiyongz
  * Apache License Version 2.0
  *
@@ -91,7 +94,7 @@ class ATL_NO_VTABLE CXMLDOMDocument :
 	public IObjectWithSiteImpl<CXMLDOMDocument>,
 	public CProxyXMLDOMDocumentEvents< CXMLDOMDocument >,
 	public IConnectionPointContainerImpl<CXMLDOMDocument>,
-	public IProvideClassInfo2Impl<&CLSID_DOMDocument, &DIID_XMLDOMDocumentEvents, &LIBID_Xerces, 2, 50>,
+	public IProvideClassInfo2Impl<&CLSID_DOMDocument, &DIID_XMLDOMDocumentEvents, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>,
 	public CWindowImpl<CXMLDOMDocument, CWindow, CWinTraits<0,0> >,
 	ErrorHandler
 {
diff --git a/src/xercesc/com/XMLDOMImplementation.h b/src/xercesc/com/XMLDOMImplementation.h
index 062e20a884212ecc0803700a8c1b72e110af24e9..66d0528cc7bc4ea2590e90d82198d674039102c7 100644
--- a/src/xercesc/com/XMLDOMImplementation.h
+++ b/src/xercesc/com/XMLDOMImplementation.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.9  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.8  2004/09/08 13:55:35  peiyongz
  * Apache License Version 2.0
  *
@@ -60,7 +63,7 @@ XERCES_CPP_NAMESPACE_USE
 
 class ATL_NO_VTABLE CXMLDOMImplementation : 
 	public CComObjectRootEx<CComSingleThreadModel>,
-	public IDispatchImpl<IXMLDOMImplementation, &IID_IXMLDOMImplementation, &LIBID_Xerces, 2, 50>
+	public IDispatchImpl<IXMLDOMImplementation, &IID_IXMLDOMImplementation, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>
 {
 public:
 	CXMLDOMImplementation()
diff --git a/src/xercesc/com/XMLDOMNamedNodeMap.h b/src/xercesc/com/XMLDOMNamedNodeMap.h
index 939c0a8669397a58347002f412ce75155bd98ea2..fa17f87ed3877e53bb2d6ce2f2c7b4da7b0ddc96 100644
--- a/src/xercesc/com/XMLDOMNamedNodeMap.h
+++ b/src/xercesc/com/XMLDOMNamedNodeMap.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.9  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.8  2004/09/08 13:55:36  peiyongz
  * Apache License Version 2.0
  *
@@ -70,7 +73,7 @@ XERCES_CPP_NAMESPACE_USE
 
 class ATL_NO_VTABLE CXMLDOMNamedNodeMap :
 	public CComObjectRootEx<CComSingleThreadModel>,
-	public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces, 2, 50>,
+	public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>,
 	public NodeContainerImpl<DOMNamedNodeMap>,
 	public ISupportErrorInfo
 {
diff --git a/src/xercesc/com/XMLDOMNodeList.h b/src/xercesc/com/XMLDOMNodeList.h
index d501d22e1589192a971751e4cb22d5baa97df99f..fc9974e6c147dbc011ce6e0ad99a6c724d999bd2 100644
--- a/src/xercesc/com/XMLDOMNodeList.h
+++ b/src/xercesc/com/XMLDOMNodeList.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.9  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.8  2004/09/08 13:55:36  peiyongz
  * Apache License Version 2.0
  *
@@ -70,7 +73,7 @@ XERCES_CPP_NAMESPACE_USE
 
 class ATL_NO_VTABLE CXMLDOMNodeList :
 	public CComObjectRootEx<CComSingleThreadModel>,
-	public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces, 2, 50>,
+	public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>,
 	public NodeContainerImpl<DOMNodeList>,
 	public ISupportErrorInfo
 {
diff --git a/src/xercesc/com/XMLDOMParseError.h b/src/xercesc/com/XMLDOMParseError.h
index 2ddcd2a68bc087943fa78602924de06471d54383..4472fe83ce9055dd7adc3952431d45b65e6751f5 100644
--- a/src/xercesc/com/XMLDOMParseError.h
+++ b/src/xercesc/com/XMLDOMParseError.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.7  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.6  2004/09/08 13:55:36  peiyongz
  * Apache License Version 2.0
  *
@@ -53,7 +56,7 @@ XERCES_CPP_NAMESPACE_USE
 
 class ATL_NO_VTABLE CXMLDOMParseError : 
 	public CComObjectRootEx<CComSingleThreadModel>,
-	public IDispatchImpl<IXMLDOMParseError, &IID_IXMLDOMParseError, &LIBID_Xerces, 2, 50>
+	public IDispatchImpl<IXMLDOMParseError, &IID_IXMLDOMParseError, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>
 {
 public:
 	CXMLDOMParseError()
diff --git a/src/xercesc/com/XMLHttpRequest.h b/src/xercesc/com/XMLHttpRequest.h
index e246f49004634c8d4b81be27855b723fc8736925..fb56e97c7f27414f734a5686be20f168b2f922a1 100644
--- a/src/xercesc/com/XMLHttpRequest.h
+++ b/src/xercesc/com/XMLHttpRequest.h
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.8  2004/10/01 08:10:38  amassari
+ * Updated version numbers to 2.6; use version macros when possible
+ *
  * Revision 1.7  2004/09/08 13:55:36  peiyongz
  * Apache License Version 2.0
  *
@@ -60,7 +63,7 @@ class ATL_NO_VTABLE CXMLHttpRequest :
 	public CComObjectRootEx<CComSingleThreadModel>,
 	public CComCoClass<CXMLHttpRequest, &CLSID_XMLHTTPRequest>,
 	public IObjectSafetyImpl<CXMLHttpRequest, INTERFACESAFE_FOR_UNTRUSTED_CALLER>,
-	public IDispatchImpl<IXMLHttpRequest, &IID_IXMLHttpRequest, &LIBID_Xerces, 2, 50>,
+	public IDispatchImpl<IXMLHttpRequest, &IID_IXMLHttpRequest, &LIBID_Xerces, XERCES_VERSION_MAJOR, INVK_CAT2_RAW_NUMERIC(XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)>,
 	public IObjectWithSiteImpl<CXMLHttpRequest>,
 	public ISupportErrorInfo,
 	public CWindowImpl<CXMLHttpRequest, CWindow, CWinTraits<0,0> >
diff --git a/src/xercesc/com/xmldocument.rgs b/src/xercesc/com/xmldocument.rgs
index b1da9bd80f849abbc88500db1e856b5bee0d1605..3a728be37f4545f39466c2a60023f45aca596e4a 100644
--- a/src/xercesc/com/xmldocument.rgs
+++ b/src/xercesc/com/xmldocument.rgs
@@ -1,19 +1,19 @@
 HKCR
 {
-	Xerces.DOMDocument.2.5.0 = s 'Apache Xerces Parser for COM'
+	Xerces.DOMDocument.2.6.0 = s 'Apache Xerces Parser for COM'
 	{
 		CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
 	}
 	Xerces.DOMDocument = s 'Apache Xerces Parser For COM'
 	{
 		CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
-		CurVer = s 'Xerces.DOMDocument.2.5.0'
+		CurVer = s 'Xerces.DOMDocument.2.6.0'
 	}
 	NoRemove CLSID
 	{
 		ForceRemove {C4775B61-ECD6-11d4-94B4-00A0CC57CBCB} = s 'Apache Xerces Parser for COM'
 		{
-			ProgID = s 'Xerces.DOMDocument.2.5.0'
+			ProgID = s 'Xerces.DOMDocument.2.6.0'
 			VersionIndependentProgID = s 'Xerces.DOMDocument'
 			ForceRemove 'Programmable'
 			InprocServer32 = s '%XMLMODULE%'
diff --git a/src/xercesc/com/xmlhttprequest.rgs b/src/xercesc/com/xmlhttprequest.rgs
index 1ab7ceede65fd96893de8a36c9f3df72aa93f122..7fbeb12325c48d3b4e93d8a725cc989fa9fe094c 100644
--- a/src/xercesc/com/xmlhttprequest.rgs
+++ b/src/xercesc/com/xmlhttprequest.rgs
@@ -1,19 +1,19 @@
 HKCR
 {
-	IBMXML.XMLHttpRequest.2.5.0 = s 'Apache Xerces XML Http Request'
+	IBMXML.XMLHttpRequest.2.6.0 = s 'Apache Xerces XML Http Request'
 	{
 		CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
 	}
 	IBMXML.XMLHttpRequest = s 'Apache Xerces XML Http Request'
 	{
 		CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
-		CurVer = s 'Xerces.XMLHttpRequest.2.5.0'
+		CurVer = s 'Xerces.XMLHttpRequest.2.6.0'
 	}
 	NoRemove CLSID
 	{
 		ForceRemove {3A725053-15FB-4065-9171-BC02BCF3876C} = s 'Apache Xerces XML Http Request'
 		{
-			ProgID = s 'Xerces.XMLHttpRequest.2.5.0'
+			ProgID = s 'Xerces.XMLHttpRequest.2.6.0'
 			VersionIndependentProgID = s 'Xerces.XMLHttpRequest'
 			ForceRemove 'Programmable'
 			InprocServer32 = s '%XMLMODULE%'