diff --git a/ChangeLog b/ChangeLog
index e6c7c1e9..d440cd00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 12 12:36:39 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* parser.c, HTMLparser.c: applied patch from John Ellson <ellson@lucent.com>
+	  closing bug #1646
+
 Mon Jul 12 11:04:44 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* Makefile.am, example/Makefile.am: closed bug #1683
diff --git a/HTMLparser.c b/HTMLparser.c
index aeb8bf71..77724444 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2642,11 +2642,7 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
     }
 
     cnt = 0;
-#ifdef HAVE_ZLIB_H
-    while(!gzeof(input)) {
-#else
     while(1) {
-#endif
 	if (cnt == len) {
 	    len *= 2;
 	    nbuf =  (char *)realloc(buffer,(len+1)*sizeof(char));
diff --git a/parser.c b/parser.c
index 7a47cd5f..e2ee7363 100644
--- a/parser.c
+++ b/parser.c
@@ -328,11 +328,7 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
     }
 
     cnt = 0;
-#ifdef HAVE_ZLIB_H
-    while(!gzeof(input)) {
-#else
     while(1) {
-#endif
 	if (cnt >= len) {
 	    len *= 2;
 	    nbuf =  (char *)realloc(buffer,(len+1)*sizeof(char));
@@ -4695,11 +4691,7 @@ xmlCreateFileParserCtxt(const char *filename)
 	}
 
 	cnt = 0;
-#ifdef HAVE_ZLIB_H
-	while(!gzeof(input)) {
-#else
 	while(1) {
-#endif
 		if (cnt == len) {
 			len *= 2;
 			nbuf =  (char *)realloc(buffer,(len+1)*sizeof(char));