diff --git a/ChangeLog b/ChangeLog
index 4b6b92f6..ce9b37dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar  3 19:45:59 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* xml2Conf.sh.in: fixes pointed out by Fredrik Hallenberg
+	* parserInternals.c: removed unneeded test raised by Stric
+
 Sat Mar  3 13:04:37 CET 2001 Bjorn Reese <breese@users.sourceforge.net>
 
 	* xpath.c: Fixed xmlXPathNodeCollectAndTest (problem reported
diff --git a/parserInternals.c b/parserInternals.c
index e271e388..281b75f4 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -2196,12 +2196,9 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
     ctxt->spaceTab[0] = -1;
     ctxt->space = &ctxt->spaceTab[0];
 
-    if (sax == NULL) {
-	ctxt->sax = &xmlDefaultSAXHandler;
-    } else {
-        ctxt->sax = sax;
-	memcpy(sax, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler));
-    }
+    ctxt->sax = sax;
+    memcpy(sax, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler));
+
     ctxt->userData = ctxt;
     ctxt->myDoc = NULL;
     ctxt->wellFormed = 1;
diff --git a/xml2Conf.sh.in b/xml2Conf.sh.in
index 264ab0b1..08cb2334 100644
--- a/xml2Conf.sh.in
+++ b/xml2Conf.sh.in
@@ -1,8 +1,8 @@
 #
 # Configuration file for using the XML library in GNOME applications
 #
-XML_LIBDIR="@XML_LIBDIR@"
-XML_LIBS="@XML_LIBS@"
-XML_INCLUDEDIR="@XML_INCLUDEDIR@"
-MODULE_VERSION="xml-@VERSION@"
+XML2_LIBDIR="@XML_LIBDIR@"
+XML2_LIBS="@XML_LIBS@"
+XML2_INCLUDEDIR="@XML_INCLUDEDIR@"
+MODULE_VERSION="xml2-@VERSION@"