diff --git a/ChangeLog b/ChangeLog
index bef38b53..02ee4173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jul  7 16:39:31 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* NEWS doc/*: regenerated
+	* nanoftp.c nanohttp.c: might fix includes problems with the
+	  Ipv6 support on solaris
+	* tree.c: patch from Markus Keim about xmlHasNsProp() on attributes
+	  defined as #IMPLIED
+
 Sun Jul  6 23:09:13 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in doc/*: preparing release 1.5.8
diff --git a/NEWS b/NEWS
index 12e68671..e2ceb1a9 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,26 @@ to test those   - More testing on RelaxNG
   Schemas
 
 
+2.5.8: Jul 6 2003:
+   - bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark
+    Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack),
+    PI related memleak, compilation without schemas or without xpath (Joerg
+    Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs,
+    rpm problem on , i86_64, removed a few compilation problems from 2.5.7,
+    xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)
+   - portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)
+   - William Brack fixed multithreading lock problems
+   - IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)
+   - Windows fixes (Igor Zlatkovic,  Eric Zurcher), threading (Stéphane
+    Bidoul)
+   - A few W3C Schemas Structure improvements
+   - W3C Schemas Datatype improvements (Charlie Bozeman)
+   - Python bindings for thread globals (Stéphane Bidoul), and method/class
+    generator 
+   - added --nonet option to xmllint 
+   - documentation improvements (John Fleck)
+
+
 2.5.7: Apr 25 2003:
    - Relax-NG: Compiling to regexp and streaming validation on top of the
     xmlReader interface, added to xmllint --stream
diff --git a/nanoftp.c b/nanoftp.c
index bd3f0d5f..16dc6f23 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -52,6 +52,12 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
diff --git a/nanohttp.c b/nanohttp.c
index 2879c141..c16cf0bc 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -27,6 +27,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/tree.c b/tree.c
index 826c37f7..c38d0b58 100644
--- a/tree.c
+++ b/tree.c
@@ -5560,7 +5560,9 @@ xmlHasProp(xmlNodePtr node, const xmlChar *name) {
 	    attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
 	    if ((attrDecl == NULL) && (doc->extSubset != NULL))
 		attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-	    if (attrDecl != NULL)
+            if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+              /* return attribute declaration only if a default value is given
+                 (that includes #FIXED declarations) */
 		return((xmlAttrPtr) attrDecl);
 	}
     }
@@ -5701,7 +5703,9 @@ xmlGetProp(xmlNodePtr node, const xmlChar *name) {
 	    attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
 	    if ((attrDecl == NULL) && (doc->extSubset != NULL))
 		attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-	    if (attrDecl != NULL)
+            if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+              /* return attribute declaration only if a default value is given
+                 (that includes #FIXED declarations) */
 		return(xmlStrdup(attrDecl->defaultValue));
 	}
     }
@@ -5756,7 +5760,9 @@ xmlGetNoNsProp(xmlNodePtr node, const xmlChar *name) {
 	    attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
 	    if ((attrDecl == NULL) && (doc->extSubset != NULL))
 		attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-	    if (attrDecl != NULL)
+            if ((attrDecl != NULL) && (attrDecl->defaultValue != NULL))
+              /* return attribute declaration only if a default value is given
+                 (that includes #FIXED declarations) */
 		return(xmlStrdup(attrDecl->defaultValue));
 	}
     }