diff --git a/ChangeLog b/ChangeLog
index 1f2a9e96..8f48d6e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb  9 17:47:40 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: applied patch to xmlSetNsProp from Mike Hommey
+
 Sun Feb  6 00:17:57 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* pattern.c xmllint.c: fixed implementation for |
diff --git a/tree.c b/tree.c
index 83bf02b1..91c2d4fd 100644
--- a/tree.c
+++ b/tree.c
@@ -6446,7 +6446,7 @@ xmlSetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name,
 	     const xmlChar *value) {
     xmlAttrPtr prop;
     
-    if ((node == NULL) || (name == NULL))
+    if ((node == NULL) || (name == NULL) || (node->type != XML_ELEMENT_NODE))
 	return(NULL);
 
     if (ns == NULL)