diff --git a/ChangeLog b/ChangeLog
index 4cdf7a2e..3d41976b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 24 16:31:22 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* python/generator.py: added most required entires to
+	  foreign encoding table, plus some additional logic to
+	  assure only the 1st param uses the 't#' format.  Fixes
+	  bug #152286, but may still have some other UTF-16 problems.
+
 Thu Dec 23 23:44:08 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* Makefile.am, gentest.py: enhanced for enabling build in
diff --git a/python/generator.py b/python/generator.py
index cd72ce9c..0b09b9a2 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -300,7 +300,17 @@ py_return_types = {
 unknown_types = {}
 
 foreign_encoding_args = (
+    'htmlCreateMemoryParserCtxt',
+    'htmlCtxtReadMemory',
+    'htmlParseChunk',
+    'htmlReadMemory',
     'xmlCreateMemoryParserCtxt',
+    'xmlCtxtReadMemory',
+    'xmlCtxtResetPush',
+    'xmlParseChunk',
+    'xmlParseMemory',
+    'xmlReadMemory',
+    'xmlRecoverMemory',
 )
 
 #######################################################################
@@ -399,11 +409,8 @@ def print_function_wrapper(name, output, export, include):
         c_args = c_args + "    %s %s;\n" % (arg[1], arg[0])
         if py_types.has_key(arg[1]):
             (f, t, n, c) = py_types[arg[1]]
-	    if name == 'xmlCreateMemoryParserCtxt':
-	        print "processing special case"
-	    if (f == 'z') and (name in foreign_encoding_args):
+	    if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0):
 	        f = 't#'
-		print "changed 'f'"
             if f != None:
                 format = format + f
             if t != None: