diff --git a/ChangeLog b/ChangeLog
index 251bc555..dfd0c2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 14 11:03:27 PDT 2003 William Brack <wbrack@mmm.com.hk>
+
+	* valid.c: fixed bug 121759 - early declaration of
+	  attribute-list in external DTD
+
 Sat Sep 13 14:42:11 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c include/libxml/xmlerror.h: starting cleaning up
diff --git a/valid.c b/valid.c
index 5e28d0da..36d1a35b 100644
--- a/valid.c
+++ b/valid.c
@@ -1214,6 +1214,11 @@ xmlAddElementDecl(xmlValidCtxtPtr ctxt, xmlDtdPtr dtd, const xmlChar *name,
 		xmlFree(uqname);
 	    return(NULL);
 	}
+	/*
+	 * For new element, may have attributes from earlier
+	 * definition in internal subset
+	 */
+	ret->attributes = oldAttributes;
     }
 
     /*
@@ -1221,7 +1226,6 @@ xmlAddElementDecl(xmlValidCtxtPtr ctxt, xmlDtdPtr dtd, const xmlChar *name,
      */
     ret->etype = type;
     ret->content = xmlCopyElementContent(content);
-    ret->attributes = oldAttributes;
 
     /*
      * Link it to the DTD