diff --git a/ChangeLog b/ChangeLog
index 78c0354e..d6d3b713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  8 16:45:55 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: fixed a bug newly introduced and pointed by Uwe Fechner
+	  in xmlCopyProp()
+
 Fri Mar  8 15:49:10 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: preparing 2.4.17 release
diff --git a/config.h.in b/config.h.in
index 83971e4d..7840ac1d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -36,6 +36,12 @@
 /* Define if you have the fprintf function.  */
 #undef HAVE_FPRINTF
 
+/* Define if you have the ftime function.  */
+#undef HAVE_FTIME
+
+/* Define if you have the gettimeofday function.  */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define if you have the isnand function.  */
 #undef HAVE_ISNAND
 
@@ -162,6 +168,9 @@
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
+/* Define if you have the <sys/timeb.h> header file.  */
+#undef HAVE_SYS_TIMEB_H
+
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
diff --git a/tree.c b/tree.c
index 6381143c..20017f73 100644
--- a/tree.c
+++ b/tree.c
@@ -2890,7 +2890,8 @@ xmlCopyProp(xmlNodePtr target, xmlAttrPtr cur) {
     /*
      * Try to handle IDs
      */
-    if ((target->doc != NULL) && (cur->doc != NULL) &&
+    if ((target!= NULL) && (cur!= NULL) &&
+	(target->doc != NULL) && (cur->doc != NULL) &&
 	(cur->doc->ids != NULL) && (cur->parent != NULL)) {
 	if (xmlIsID(cur->doc, cur->parent, cur)) {
 	    xmlChar *id;