diff --git a/ChangeLog b/ChangeLog
index 32977bb3..e06beea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 21 10:59:55 CET 2004 Daniel Veillard <daniel@veillard.com>
+
+	* xmlwriter.c: applied patch from Alfred Mickautsch fixing a memory
+	  leak reported on the list.
+
 Thu Jan 15 00:48:46 CET 2004 Daniel Veillard <daniel@veillard.com>
 
 	* python/generator.py python/tests/tstLastError.py: applied
diff --git a/xmlwriter.c b/xmlwriter.c
index 5a311255..720c20d4 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -65,6 +65,7 @@ struct _xmlTextWriter {
     int doindent;	    /* internal indent flag */
     xmlChar *ichar;            /* indent character */
     char qchar;             /* character used for quoting attribute values */
+    xmlParserCtxtPtr ctxt;
 };
 
 static void xmlFreeTextWriterStackEntry(xmlLinkPtr lk);
@@ -249,6 +250,8 @@ xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt,
         return NULL;
     }
 
+    ret->ctxt = ctxt;
+
     return ret;
 }
 
@@ -373,6 +376,9 @@ xmlFreeTextWriter(xmlTextWriterPtr writer)
     if (writer->nsstack != NULL)
         xmlListDelete(writer->nsstack);
 
+    if (writer->ctxt != NULL)
+        xmlFreeParserCtxt(writer->ctxt);
+
     xmlFree(writer);
 }