diff --git a/ChangeLog b/ChangeLog
index 3617f7c0..24f25905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 09:43:48 EST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: applied patch from #123105 about defaulted attributes
+	  from element coming from an entity
+
 Mon Oct 27 21:12:27 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
 	* xmllint.c: fixed warning message from IRIX (bug 125182)
diff --git a/parser.c b/parser.c
index 21d1b89c..bca57f87 100644
--- a/parser.c
+++ b/parser.c
@@ -11017,6 +11017,8 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
 	ctxt->loadsubset |= XML_SKIP_IDS;
     }
     ctxt->dictNames = oldctxt->dictNames;
+    ctxt->attsDefault = oldctxt->attsDefault;
+    ctxt->attsSpecial = oldctxt->attsSpecial;
 
     xmlParseContent(ctxt);
     if ((RAW == '<') && (NXT(1) == '/')) {
@@ -11066,6 +11068,8 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
 	
     ctxt->sax = oldsax;
     ctxt->dict = NULL;
+    ctxt->attsDefault = NULL;
+    ctxt->attsSpecial = NULL;
     xmlFreeParserCtxt(ctxt);
     if (newDoc != NULL)
 	xmlFreeDoc(newDoc);