diff --git a/ChangeLog b/ChangeLog
index 0258afb3..a878b970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 17 11:40:21 PST 2004 William Brack <wbrack@mmm.com.hk>
+
+	* doc/Makefile.am: changed maintainer-clean dependency with
+	  suggestion from Crispin Flowerday (bug #157634)
+	* debugXML.c: fixed crash when ATTRIBUTE or DOCUMENT nodes
+	  were specified with debugDumpNode (bug #160621)
+
 Fri Dec 10 11:24:41 CET 2004 Daniel Veillard <daniel@veillard.com>
 
 	* valid.c: fixed ID deallocation problem based on patch from
diff --git a/debugXML.c b/debugXML.c
index 1b8fd708..a014f009 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -894,7 +894,8 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
             if (!ctxt->check)
                 xmlCtxtDumpSpaces(ctxt);
             fprintf(ctxt->output, "Error, ATTRIBUTE found here\n");
-            break;
+            xmlCtxtGenericNodeCheck(ctxt, node);
+            return;
         case XML_TEXT_NODE:
             if (!ctxt->check) {
                 xmlCtxtDumpSpaces(ctxt);
@@ -940,8 +941,9 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
             if (!ctxt->check) {
                 xmlCtxtDumpSpaces(ctxt);
             }
-            fprintf(ctxt->output, "PBM: DOCUMENT found here\n");
-            break;
+            fprintf(ctxt->output, "Error, DOCUMENT found here\n");
+            xmlCtxtGenericNodeCheck(ctxt, node);
+            return;
         case XML_DOCUMENT_TYPE_NODE:
             if (!ctxt->check) {
                 xmlCtxtDumpSpaces(ctxt);
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3ca14916..459872ec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -92,7 +92,7 @@ xmlcatalog.1: xmlcatalog_man.xml
 clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
 
-maintainer-clean-local: clean
+maintainer-clean-local: clean-local
 	rm -rf libxml-decl-list.txt libxml-decl.txt 
 
 rebuild: api all