diff --git a/ChangeLog b/ChangeLog
index 90392865..52c86a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 30 22:29:34 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* xpath.c: fix of an XSLT namespace bug reported on the list
+	  general/bug-8-
+
 Mon Apr 30 19:42:58 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* strio.h trio.c: Dan McNichol suggested a couple of small
diff --git a/xpath.c b/xpath.c
index d65f2513..5c83a8d8 100644
--- a/xpath.c
+++ b/xpath.c
@@ -1966,8 +1966,15 @@ xmlXPathNsLookup(xmlXPathContextPtr ctxt, const xmlChar *prefix) {
 	return(XML_XML_NAMESPACE);
 #endif
 
-    if (ctxt->nsHash == NULL)
-	return(NULL);
+    if (ctxt->namespaces != NULL) {
+	int i;
+
+	for (i = 0;i < ctxt->nsNr;i++) {
+	    if ((ctxt->namespaces[i] != NULL) &&
+		(xmlStrEqual(ctxt->namespaces[i]->prefix, prefix)))
+		return(ctxt->namespaces[i]->href);
+	}
+    }
 
     return((const xmlChar *) xmlHashLookup(ctxt->nsHash, prefix));
 }