diff --git a/ChangeLog b/ChangeLog
index b2271749..e4a8bc5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 17 19:56:33 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* parser.c: Stephan Kulow also raised the fact that line number
+	  could get miscounted making debug harder, fixed the problem
+	  in xmlParseCharData()
+
 Sun Jun 17 19:17:26 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* valid.c: Stephan Kulow pointed out a problem when validating
diff --git a/parser.c b/parser.c
index e76c9263..615e293c 100644
--- a/parser.c
+++ b/parser.c
@@ -2509,10 +2509,14 @@ get_more:
 			    ctxt->sax->characters(ctxt->userData,
 						  tmp, nbchar);
 		    }
+                    line = ctxt->input->line;
+                    col = ctxt->input->col;
 		} else {
 		    if (ctxt->sax->characters != NULL)
 			ctxt->sax->characters(ctxt->userData,
 					      ctxt->input->cur, nbchar);
+                    line = ctxt->input->line;
+                    col = ctxt->input->col;
 		}
 	    }
 	    ctxt->input->cur = in;