diff --git a/ChangeLog b/ChangeLog
index a6c61a77..e83e05d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 14 11:48:33 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* parser.c: small enhancement to dtd handling of (a?)+ (bug 142487)
+
 Thu May 13 23:19:00 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
 	* xmlIO.c xmlsave.c include/libxml/xmlIO.h: second pass on escaping
diff --git a/parser.c b/parser.c
index 0fbf719d..4810e221 100644
--- a/parser.c
+++ b/parser.c
@@ -4822,7 +4822,10 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
 	if (ret != NULL) {
 	    int found = 0;
 
-	    ret->ocur = XML_ELEMENT_CONTENT_PLUS;
+	    if (ret->ocur == XML_ELEMENT_CONTENT_OPT)
+	        ret->ocur == XML_ELEMENT_CONTENT_MULT;
+	    else
+	        ret->ocur = XML_ELEMENT_CONTENT_PLUS;
 	    /*
 	     * Some normalization:
 	     * (a | b*)+ == (a | b)*