diff --git a/ChangeLog b/ChangeLog
index 0fbc0eb2..c52b251c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 28 00:23:00 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: fixed a node dump crash on attributes
+	* test/xsdtest/xsdtest.xml test/xsdtest/xsdtest.xsl: fixed
+	  an URI test bug and get better output.
+
 Thu Feb 27 22:28:40 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* check-xsddata-test-suite.py: give more infos
diff --git a/test/xsdtest/xsdtest.xml b/test/xsdtest/xsdtest.xml
index 2fe94b65..45d0be1d 100644
--- a/test/xsdtest/xsdtest.xml
+++ b/test/xsdtest/xsdtest.xml
@@ -21,10 +21,11 @@
 <datatype name="anyURI">
 <valid>foobar</valid>
 <valid>http://www.example.com</valid>
-<valid>http://www.example.co%6d</valid>
+<valid>http://ji%6d@www.example.com</valid>
 <valid>nosuchscheme:stuff</valid>
 <invalid>foo$bar:stuff</invalid>
 <invalid>f%oobar</invalid>
+<invalid>http://www.example.co%6d</invalid>
 </datatype>
 <datatype name="integer">
 <valid>10</valid>
diff --git a/test/xsdtest/xsdtest.xsl b/test/xsdtest/xsdtest.xsl
index 1290b168..d57adf23 100644
--- a/test/xsdtest/xsdtest.xsl
+++ b/test/xsdtest/xsdtest.xsl
@@ -12,6 +12,8 @@
 </xsl:template>
 
 <xsl:template match="datatype">
+<testSuite>
+<documentation>Datatype <xsl:value-of select="@name"/></documentation>
 <testCase>
 <requires datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"/>
 <correct>
@@ -27,6 +29,7 @@
 <xsl:apply-templates select="valid|invalid"/>
 </testCase>
 <xsl:apply-templates select="equiv/class|length|lessThan|incomparable"/>
+</testSuite>
 </xsl:template>
 
 <xsl:template match="valid">
diff --git a/tree.c b/tree.c
index 1a03a5ab..f6b928cc 100644
--- a/tree.c
+++ b/tree.c
@@ -6993,6 +6993,10 @@ xmlNodeDumpOutputInternal(xmlOutputBufferPtr buf, xmlDocPtr doc,
         xmlOutputBufferWriteString(buf, "]]>");
 	return;
     }
+    if (cur->type == XML_ATTRIBUTE_NODE) {
+	xmlAttrDumpOutput(buf,doc,cur,encoding);
+	return;
+    }
     if (cur->type == XML_NAMESPACE_DECL) {
 	xmlNsDumpOutput(buf, (xmlNsPtr) cur);
 	return;