diff --git a/ChangeLog b/ChangeLog
index ce43f3b2..bcf38e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 23 22:00:14 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: validity status was not passed back when validating in
+	  entities, but raised by Oliver Fischer
+
 Sun Mar 23 21:30:50 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* HTMLtree.c: avoid escaping ',' in URIs
diff --git a/parser.c b/parser.c
index 1a53b7ff..0189d78f 100644
--- a/parser.c
+++ b/parser.c
@@ -9603,6 +9603,7 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
      */
     ctxt->instate = XML_PARSER_CONTENT;
     ctxt->validate = ctx->validate;
+    ctxt->valid = ctx->valid;
     ctxt->loadsubset = ctx->loadsubset;
     ctxt->depth = ctx->depth + 1;
     ctxt->replaceEntities = ctx->replaceEntities;
@@ -9620,6 +9621,8 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
 
     xmlParseContent(ctxt);
    
+    ctx->validate = ctxt->validate;
+    ctx->valid = ctxt->valid;
     if ((RAW == '<') && (NXT(1) == '/')) {
 	ctxt->errNo = XML_ERR_NOT_WELL_BALANCED;
 	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))