diff --git a/ChangeLog b/ChangeLog
index 674290bb..fc1229f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  9 18:09:31 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: patch from Markus Henke when an encoding ain't recognized
+
 Tue Apr  9 15:47:14 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* libxml.m4: got a report that #include <string.h> was needed
diff --git a/parser.c b/parser.c
index a14cdbda..4601997a 100644
--- a/parser.c
+++ b/parser.c
@@ -7268,6 +7268,7 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) {
 	    if (enc != XML_CHAR_ENCODING_ERROR) {
 		xmlSwitchEncoding(ctxt, enc);
 		if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
+		    ctxt->input->encoding = NULL;
 		    xmlFree(encoding);
 		    return(NULL);
 		}