diff --git a/ChangeLog b/ChangeLog
index 46037c85..5bdce6c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan  9 15:33:16 CET 2006 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: reverted first patches for #319279 which led to #326295
+	  and fixed the problem in xmlParseChunk() instead
+	* test/ent11 result//ent11*: added test for #326295 to the regression
+	  suite
+
 Thu Jan  5 16:25:06 CET 2006 Daniel Veillard <daniel@veillard.com>
 
 	* NEWS configure.in libxml.spec.in testapi.c doc/*: upated the news
diff --git a/parser.c b/parser.c
index ec7fb531..8c2fed3c 100644
--- a/parser.c
+++ b/parser.c
@@ -3539,16 +3539,12 @@ get_more:
 	    ctxt->input->cur = in;
 	    if (*in == 0xD) {
 		in++;
-		if (!*in)	/* if end of current chunk return */
-		    return;
 		if (*in == 0xA) {
 		    ctxt->input->cur = in;
 		    in++;
 		    ctxt->input->line++; ctxt->input->col = 1;
 		    continue; /* while */
 		}
-		if (!*in)	/* if end of current chunk return */
-		    return;
 		in--;
 	    }
 	    if (*in == '<') {
@@ -3931,8 +3927,6 @@ get_more:
 		ctxt->input->line++; ctxt->input->col = 1;
 		continue; /* while */
 	    }
-	    if (!*in)	/* if end of current chunk return */
-		return;
 	    in--;
 	}
 	SHRINK;
@@ -10407,12 +10401,19 @@ encoding_error:
 int
 xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
               int terminate) {
+    int end_in_lf = 0;
+
     if (ctxt == NULL)
         return(XML_ERR_INTERNAL_ERROR);
     if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
         return(ctxt->errNo);
     if (ctxt->instate == XML_PARSER_START)
         xmlDetectSAX2(ctxt);
+    if ((size > 0) && (chunk != NULL) && (!terminate) &&
+        (chunk[size - 1] == '\r')) {
+	end_in_lf = 1;
+	size--;
+    }
     if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
         (ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF))  {
 	int base = ctxt->input->base - ctxt->input->buf->buffer->content;
@@ -10451,6 +10452,10 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
 	}
     }
     xmlParseTryOrFinish(ctxt, terminate);
+    if ((end_in_lf == 1) && (ctxt->input != NULL) &&
+        (ctxt->input->buf != NULL)) {
+	xmlParserInputBufferPush(ctxt->input->buf, 1, "\r");
+    }
     if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
         return(ctxt->errNo);
     if (terminate) {
diff --git a/result/ent11 b/result/ent11
new file mode 100644
index 00000000..7eee0235
--- /dev/null
+++ b/result/ent11
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE doc [
+<!ENTITY newl "&#13;">
+]>
+<doc>&newl;</doc>
diff --git a/result/ent11.rde b/result/ent11.rde
new file mode 100644
index 00000000..f6c3c279
--- /dev/null
+++ b/result/ent11.rde
@@ -0,0 +1,5 @@
+0 10 doc 0 0
+0 1 doc 0 0
+1 14 #text 0 1 
+
+0 15 doc 0 0
diff --git a/result/ent11.rdr b/result/ent11.rdr
new file mode 100644
index 00000000..54a754a0
--- /dev/null
+++ b/result/ent11.rdr
@@ -0,0 +1,4 @@
+0 10 doc 0 0
+0 1 doc 0 0
+1 5 newl 0 0
+0 15 doc 0 0
diff --git a/result/ent11.sax b/result/ent11.sax
new file mode 100644
index 00000000..4e36a6b9
--- /dev/null
+++ b/result/ent11.sax
@@ -0,0 +1,13 @@
+SAX.setDocumentLocator()
+SAX.startDocument()
+SAX.internalSubset(doc, , )
+SAX.entityDecl(newl, 1, (null), (null), 
)
+SAX.getEntity(newl)
+SAX.externalSubset(doc, , )
+SAX.startElement(doc)
+SAX.getEntity(newl)
+SAX.characters(
+, 1)
+SAX.reference(newl)
+SAX.endElement(doc)
+SAX.endDocument()
diff --git a/result/ent11.sax2 b/result/ent11.sax2
new file mode 100644
index 00000000..e80778f1
--- /dev/null
+++ b/result/ent11.sax2
@@ -0,0 +1,13 @@
+SAX.setDocumentLocator()
+SAX.startDocument()
+SAX.internalSubset(doc, , )
+SAX.entityDecl(newl, 1, (null), (null), 
)
+SAX.getEntity(newl)
+SAX.externalSubset(doc, , )
+SAX.startElementNs(doc, NULL, NULL, 0, 0, 0)
+SAX.getEntity(newl)
+SAX.characters(
+, 1)
+SAX.reference(newl)
+SAX.endElementNs(doc, NULL, NULL)
+SAX.endDocument()
diff --git a/result/noent/ent11 b/result/noent/ent11
new file mode 100644
index 00000000..e1e1e0f0
--- /dev/null
+++ b/result/noent/ent11
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE doc [
+<!ENTITY newl "&#13;">
+]>
+<doc>
+</doc>
diff --git a/test/ent11 b/test/ent11
new file mode 100644
index 00000000..6c611c15
--- /dev/null
+++ b/test/ent11
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE doc [
+ <!ENTITY newl "&#13;">
+]>
+
+<doc>&newl;</doc>