diff --git a/ChangeLog b/ChangeLog
index 64b05f69..c699b521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  7 23:42:46 EDT 1998 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* added hooks to keep track of servants when creating objects
+	  xmlDoc and xmlNode (for Corba export).
+
 Sun Oct  4 03:18:09 EDT 1998 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* added xml-config script.
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index b79d4b92..714d4a6b 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -94,15 +94,16 @@ typedef struct xmlAttr {
 #define XML_TYPE_ENTITY		3
 
 typedef struct xmlNode {
+    int             type;	/* type number in the DTD */
     struct xmlNode *parent;	/* child->parent link */
     struct xmlNode *next;	/* next sibling link  */
     struct xmlNode *childs;	/* parent->childs link */
     struct xmlAttr *properties;	/* properties list */
-    int             type;	/* type number in the DTD */
     const CHAR     *name;       /* the name of the node, or the entity */
     xmlNs          *ns;         /* pointer to the associated namespace */
     xmlNs          *nsDef;      /* namespace definitions on this node */
     CHAR           *content;    /* the content */
+    void           *servant;	/* for Corba ! */
 } xmlNode, *xmlNodePtr;
 
 /*
@@ -118,6 +119,7 @@ typedef struct xmlDoc {
     struct xmlNs   *oldNs;	/* Global namespace, the old way */
     void          *entities;    /* Hash table for general entities if any */
     struct xmlNode *root;	/* the document tree */
+    void           *servant;	/* for Corba ! */
 } xmlDoc, *xmlDocPtr;
 
 /*
diff --git a/tree.c b/tree.c
index dd203182..b2d67e44 100644
--- a/tree.c
+++ b/tree.c
@@ -277,6 +277,7 @@ xmlDocPtr xmlNewDoc(const CHAR *version) {
     cur->entities = NULL;
     cur->standalone = -1;
     cur->compression = xmlCompressMode;
+    cur->servant = NULL;
     return(cur);
 }
 
@@ -404,6 +405,7 @@ xmlNodePtr xmlNewNode(xmlNsPtr ns, const CHAR *name, CHAR *content) {
     cur->name = xmlStrdup(name);
     cur->ns = ns;
     cur->nsDef = NULL;
+    cur->servant = NULL;
     if (content != NULL)
 	cur->content = xmlStrdup(content);
     else 
diff --git a/tree.h b/tree.h
index b79d4b92..714d4a6b 100644
--- a/tree.h
+++ b/tree.h
@@ -94,15 +94,16 @@ typedef struct xmlAttr {
 #define XML_TYPE_ENTITY		3
 
 typedef struct xmlNode {
+    int             type;	/* type number in the DTD */
     struct xmlNode *parent;	/* child->parent link */
     struct xmlNode *next;	/* next sibling link  */
     struct xmlNode *childs;	/* parent->childs link */
     struct xmlAttr *properties;	/* properties list */
-    int             type;	/* type number in the DTD */
     const CHAR     *name;       /* the name of the node, or the entity */
     xmlNs          *ns;         /* pointer to the associated namespace */
     xmlNs          *nsDef;      /* namespace definitions on this node */
     CHAR           *content;    /* the content */
+    void           *servant;	/* for Corba ! */
 } xmlNode, *xmlNodePtr;
 
 /*
@@ -118,6 +119,7 @@ typedef struct xmlDoc {
     struct xmlNs   *oldNs;	/* Global namespace, the old way */
     void          *entities;    /* Hash table for general entities if any */
     struct xmlNode *root;	/* the document tree */
+    void           *servant;	/* for Corba ! */
 } xmlDoc, *xmlDocPtr;
 
 /*