diff --git a/ChangeLog b/ChangeLog
index a58d3049..dbb4dafe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 16 12:55:48 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* parser.c parser.h parserInternals.h: fixed a couple of
+	  interfaces for handling memory buffer input to const char *
+	  upon suggestion of JamesH.
+
 Tue May 15 17:22:27 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* configure.in: LoTR sent a patch fixing the previous commit 
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 61f61aec..0e91245d 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -402,7 +402,7 @@ int		xmlSAXUserParseFile	(xmlSAXHandlerPtr sax,
 					 const char *filename);
 int		xmlSAXUserParseMemory	(xmlSAXHandlerPtr sax,
 					 void *user_data,
-					 char *buffer,
+					 const char *buffer,
 					 int size);
 xmlDocPtr	xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
 					 char *buffer,
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index f343cdbd..5a23c3cd 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -137,7 +137,7 @@ int			xmlIsChar	(int c);
  */
 xmlParserCtxtPtr	xmlCreateDocParserCtxt	(xmlChar *cur);
 xmlParserCtxtPtr	xmlCreateFileParserCtxt	(const char *filename);
-xmlParserCtxtPtr	xmlCreateMemoryParserCtxt(char *buffer,
+xmlParserCtxtPtr	xmlCreateMemoryParserCtxt(const char *buffer,
 						 int size);
 xmlParserCtxtPtr	xmlNewParserCtxt	(void);
 xmlParserCtxtPtr	xmlCreateEntityParserCtxt(const xmlChar *URL,
diff --git a/parser.c b/parser.c
index 626461a4..d93de3ba 100644
--- a/parser.c
+++ b/parser.c
@@ -9630,7 +9630,7 @@ xmlSAXUserParseFile(xmlSAXHandlerPtr sax, void *user_data,
  * Returns the new parser context or NULL
  */
 xmlParserCtxtPtr
-xmlCreateMemoryParserCtxt(char *buffer, int size) {
+xmlCreateMemoryParserCtxt(const char *buffer, int size) {
     xmlParserCtxtPtr ctxt;
     xmlParserInputPtr input;
     xmlParserInputBufferPtr buf;
@@ -9745,7 +9745,7 @@ xmlDocPtr xmlRecoverMemory(char *buffer, int size) {
  * Returns 0 in case of success or a error number otherwise
  */
 int xmlSAXUserParseMemory(xmlSAXHandlerPtr sax, void *user_data,
-			  char *buffer, int size) {
+			  const char *buffer, int size) {
     int ret = 0;
     xmlParserCtxtPtr ctxt;
     xmlSAXHandlerPtr oldsax = NULL;
diff --git a/parser.h b/parser.h
index 61f61aec..0e91245d 100644
--- a/parser.h
+++ b/parser.h
@@ -402,7 +402,7 @@ int		xmlSAXUserParseFile	(xmlSAXHandlerPtr sax,
 					 const char *filename);
 int		xmlSAXUserParseMemory	(xmlSAXHandlerPtr sax,
 					 void *user_data,
-					 char *buffer,
+					 const char *buffer,
 					 int size);
 xmlDocPtr	xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
 					 char *buffer,
diff --git a/parserInternals.h b/parserInternals.h
index f343cdbd..5a23c3cd 100644
--- a/parserInternals.h
+++ b/parserInternals.h
@@ -137,7 +137,7 @@ int			xmlIsChar	(int c);
  */
 xmlParserCtxtPtr	xmlCreateDocParserCtxt	(xmlChar *cur);
 xmlParserCtxtPtr	xmlCreateFileParserCtxt	(const char *filename);
-xmlParserCtxtPtr	xmlCreateMemoryParserCtxt(char *buffer,
+xmlParserCtxtPtr	xmlCreateMemoryParserCtxt(const char *buffer,
 						 int size);
 xmlParserCtxtPtr	xmlNewParserCtxt	(void);
 xmlParserCtxtPtr	xmlCreateEntityParserCtxt(const xmlChar *URL,