diff --git a/ChangeLog b/ChangeLog
index 5dbc926a..4451df50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 19 10:59:41 CET 2001 Bjorn Reese <breese@users.sourceforge.net>
+
+	* xpath.c: fixed "*" (unbelievable !) and a couple of warnings
+
 Sun Feb 18 17:52:37 MET 2001 Bjorn Reese <breese@users.sourceforge.net>
 
 	* xpath.c: fixed whitespace handling in xmlXPathStringEvalNumber,
diff --git a/xpath.c b/xpath.c
index 148ebe2b..57ca1437 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3309,7 +3309,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, xmlXPathAxisVal axis,
 #ifdef DEBUG_STEP
 					n++;
 #endif
-					addNode(ret, attr);
+					addNode(ret, (xmlNodePtr) attr);
 				    }
 				} else {
 				    if ((attr->ns != NULL) && 
@@ -3318,7 +3318,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, xmlXPathAxisVal axis,
 #ifdef DEBUG_STEP
 					n++;
 #endif
-					addNode(ret, attr);
+					addNode(ret, (xmlNodePtr) attr);
 				    }
 				}
 			    }
@@ -5149,6 +5149,9 @@ xmlXPathEvalPathExpr(xmlXPathParserContextPtr ctxt) {
     if ((CUR == '$') || (CUR == '(') || (IS_DIGIT(CUR)) ||
         (CUR == '\'') || (CUR == '"')) {
 	lc = 0;
+    } else if (CUR == '*') {
+	/* relative or absolute location path */
+	lc = 1;
     } else if (CUR == '/') {
 	/* relative or absolute location path */
 	lc = 1;