diff --git a/ChangeLog b/ChangeLog
index cdce711f..0d83e8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 23 18:30:28 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* xpath.c: fixed the bug generating a template loop in libxslt
+	  when using docbook-xsl-1.4, * should filter out document nodes
+	* HACKING: added William
+	* TODO: updated
+
 Fri Jun 22 18:02:37 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* doc/FAQ.html: added a warning about gcc-3.0
diff --git a/HACKING b/HACKING
index 09890206..cafb99a2 100644
--- a/HACKING
+++ b/HACKING
@@ -28,5 +28,6 @@ This simply mean that I'm on holliday or on the road.
 
 Daniel
 
-P.S.: Bjorn Reese get an exception for the send before commit rule
+P.S.: Bjorn Reese and William Brack get an exception for the send before
+      commit rule
 
diff --git a/TODO b/TODO
index 2ae1246b..da39f666 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,9 @@ TODO:
 - Fix output of <tst val="x&#xA;y"/>
 - Implement OASIS XML Catalog support
   http://www.oasis-open.org/committees/entity/
+- Stricten the UTF8 conformance (Martin Duerst):
+  http://www.w3.org/2001/06/utf-8-test/.
+  The bad files are in http://www.w3.org/2001/06/utf-8-wrong/.
   
 
 TODO:
diff --git a/xpath.c b/xpath.c
index e59c12cd..c22a8385 100644
--- a/xpath.c
+++ b/xpath.c
@@ -7361,9 +7361,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
 			    addNode(list, cur);
 			}
 		    } else {
-			if ((cur->type == XML_ELEMENT_NODE) ||
-			    (cur->type == XML_DOCUMENT_NODE) ||
-			    (cur->type == XML_HTML_DOCUMENT_NODE)) {
+			if (cur->type == XML_ELEMENT_NODE) {
 			    if (prefix == NULL) {
 #ifdef DEBUG_STEP
 				n++;