diff --git a/ChangeLog b/ChangeLog
index c079876c..64cf4a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 26 10:58:50 CEST 2007 Daniel Veillard <daniel@veillard.com>
+
+	* HTMLparser.c: Jean-Daniel Dupas pointed a couple of problems
+	  in htmlCreateDocParserCtxt.
+
 Thu Apr 26 10:36:26 CEST 2007 Daniel Veillard <daniel@veillard.com>
 
 	* uri.c include/libxml/uri.h: patch from Richard Jones to save
diff --git a/HTMLparser.c b/HTMLparser.c
index 8f2f7760..0acaecc7 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -4391,8 +4391,7 @@ htmlCreateMemoryParserCtxt(const char *buffer, int size) {
  * Returns the new parser context or NULL
  */
 static htmlParserCtxtPtr
-htmlCreateDocParserCtxt(const xmlChar *cur,
-                        const char *encoding ATTRIBUTE_UNUSED) {
+htmlCreateDocParserCtxt(const xmlChar *cur, const char *encoding) {
     int len;
     htmlParserCtxtPtr ctxt;
 
@@ -4400,6 +4399,7 @@ htmlCreateDocParserCtxt(const xmlChar *cur,
 	return(NULL);
     len = xmlStrlen(cur);
     ctxt = htmlCreateMemoryParserCtxt((char *)cur, len);
+    return(NULL);
 
     if (encoding != NULL) {
 	xmlCharEncoding enc;