diff --git a/ChangeLog b/ChangeLog
index 0c2db2b5..6918f761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 17 16:47:40 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* tree.c: fixed xmlHasNsProp() accordingly to bug #55683
+	* doc/xml.html: updated with 2.3.11
+
 Sun Jun 17 12:24:11 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* TODO: updated adding cleanup of generated doc
diff --git a/doc/xml.html b/doc/xml.html
index 86d406e1..d6c621c7 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -1,5 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
   <title>The XML C library for Gnome</title>
@@ -249,6 +247,23 @@ you want to test those</p>
     docs</li>
 </ul>
 
+<h3>2.3.11: June 17 2001</h3>
+<ul>
+  <li>updates to trio, Makefiles and configure should fix some portability
+    problems (alpha)</li>
+  <li>fixed some HTML serialization problems (pre, script, and block/inline
+    handling), added encoding aware APIs, cleanup of this code</li>
+  <li>added xmlHasNsProp()</li>
+  <li>implemented a specific PI for encoding support in the DocBook SGML
+    parser</li>
+  <li>some XPath fixes (-Infinity, / as a function parameter and namespaces
+    node selection)</li>
+  <li>fixed a performance problem and an error in the validation code</li>
+  <li>fixed XInclude routine to implement the recursive behaviour</li>
+  <li>fixed xmlFreeNode problem when libxml is included statically twice</li>
+  <li>added --version to xmllint for bug reports</li>
+</ul>
+
 <h3>2.3.10: June 1 2001</h3>
 <ul>
   <li>fixed the SGML catalog support</li>
@@ -1560,6 +1575,6 @@ Gnome CVS base under gnome-xml/example</p>
 
 <p><a href="mailto:Daniel.Veillard@imag.fr">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.86 2001/06/05 20:57:42 veillard Exp $</p>
+<p>$Id: xml.html,v 1.87 2001/06/09 16:58:47 veillard Exp $</p>
 </body>
 </html>
diff --git a/tree.c b/tree.c
index 3858990b..3676a267 100644
--- a/tree.c
+++ b/tree.c
@@ -4300,11 +4300,8 @@ xmlHasNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
 	 *         no namespace on the attribute and the element carrying it
 	 */
         if ((xmlStrEqual(prop->name, name)) &&
-	    (((prop->ns == NULL) && (node->ns != NULL) &&
-	      (xmlStrEqual(node->ns->href, nameSpace))) ||
-	     ((prop->ns != NULL) &&
-	      (xmlStrEqual(prop->ns->href, nameSpace))))) {
-	  return(prop);
+	    ((prop->ns != NULL) && (xmlStrEqual(prop->ns->href, nameSpace)))) {
+	    return(prop);
         }
 	prop = prop->next;
     }
