diff --git a/ChangeLog b/ChangeLog
index 6e36738a..207f521c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 18 00:54:30 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: fixed another stupid bug in xmlGetNodePath()
+	* xmllint.c: --version now report the options compiled in
+
 Tue Sep 17 23:48:07 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* HTMLparser.c: small cleanup
diff --git a/tree.c b/tree.c
index faf33f7a..7177ae6c 100644
--- a/tree.c
+++ b/tree.c
@@ -3484,7 +3484,8 @@ xmlGetNodePath(xmlNodePtr node)
              */
             tmp = cur->prev;
             while (tmp != NULL) {
-                if (xmlStrEqual(cur->name, tmp->name))
+                if ((tmp->type == XML_ELEMENT_NODE) &&
+		    (xmlStrEqual(cur->name, tmp->name)))
                     occur++;
                 tmp = tmp->prev;
             }
diff --git a/xmllint.c b/xmllint.c
index 6ad59604..08ca48c0 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -981,6 +981,57 @@ static void parseAndPrintFile(char *filename) {
  * 									*
  ************************************************************************/
 
+static void showVersion(const char *name) {
+    fprintf(stderr, "%s: using libxml version %s\n", name, xmlParserVersion);
+    fprintf(stderr, "   compiled with: ");
+#ifdef LIBXML_FTP_ENABLED
+    fprintf(stderr, "FTP ");
+#endif
+#ifdef LIBXML_HTTP_ENABLED
+    fprintf(stderr, "HTTP ");
+#endif
+#ifdef LIBXML_HTML_ENABLED
+    fprintf(stderr, "HTML ");
+#endif
+#ifdef LIBXML_C14N_ENABLED
+    fprintf(stderr, "C14N ");
+#endif
+#ifdef LIBXML_CATALOG_ENABLED
+    fprintf(stderr, "Catalog ");
+#endif
+#ifdef LIBXML_DOCB_ENABLED
+    fprintf(stderr, "DocBook ");
+#endif
+#ifdef LIBXML_XPATH_ENABLED
+    fprintf(stderr, "XPath ");
+#endif
+#ifdef LIBXML_XPTR_ENABLED
+    fprintf(stderr, "XPointer ");
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+    fprintf(stderr, "XInclude ");
+#endif
+#ifdef LIBXML_ICONV_ENABLED
+    fprintf(stderr, "Iconv ");
+#endif
+#ifdef DEBUG_MEMORY_LOCATION
+    fprintf(stderr, "MemDebug ");
+#endif
+#ifdef LIBXML_UNICODE_ENABLED
+    fprintf(stderr, "Unicode ");
+#endif
+#ifdef LIBXML_REGEXP_ENABLED
+    fprintf(stderr, "Regexps ");
+#endif
+#ifdef LIBXML_AUTOMATA_ENABLED
+    fprintf(stderr, "Automata ");
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+    fprintf(stderr, "Schemas ");
+#endif
+    fprintf(stderr, "\n");
+}
+
 static void usage(const char *name) {
     printf("Usage : %s [options] XMLfiles ...\n", name);
     printf("\tParse the XML files and output the result of the parsing\n");
@@ -1073,8 +1124,7 @@ main(int argc, char **argv) {
 	    noent++;
 	else if ((!strcmp(argv[i], "-version")) ||
 	         (!strcmp(argv[i], "--version"))) {
-	    fprintf(stderr, "xmllint: using libxml version %s\n",
-		    xmlParserVersion);
+	    showVersion(argv[0]);
 	    version = 1;
 	} else if ((!strcmp(argv[i], "-noout")) ||
 	         (!strcmp(argv[i], "--noout")))