diff --git a/ChangeLog b/ChangeLog
index 1bc309eb..a1af2f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  2 18:47:33 CEST 2007 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: tried to fix an error problem on entity content failure
+	  reported by Michael Day
+
 Wed May  2 18:23:35 CEST 2007 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: typo patch from Bjorn Reese
diff --git a/parser.c b/parser.c
index b405164c..817d8d82 100644
--- a/parser.c
+++ b/parser.c
@@ -6097,7 +6097,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
 			}
 		    } else if ((ret != XML_ERR_OK) &&
 		               (ret != XML_WAR_UNDECLARED_ENTITY)) {
-			xmlFatalErr(ctxt, ret, NULL);
+			xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
+				 "Entity '%s' failed to parse\n", ent->name);
 		    } else if (list != NULL) {
 			xmlFreeNodeList(list);
 			list = NULL;