diff --git a/ChangeLog b/ChangeLog
index 564120fc..bc2e78e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 16 09:51:05 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* HTMLparser.c: remove a warning
+	* encoding.c: check with uppercase for AIX iconv() should fix #352644
+	* doc/examples/Makefile.am: partially handle one bug report
+
 Sun Oct 15 22:31:42 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c: fix the patch for unreproductable #343000 but
diff --git a/HTMLparser.c b/HTMLparser.c
index 3d2dffbc..3e5d813e 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -1047,7 +1047,7 @@ htmlInitAutoClose(void) {
     for (indx = 0;indx < 100;indx ++) htmlStartCloseIndex[indx] = NULL;
     indx = 0;
     while ((htmlStartClose[i] != NULL) && (indx < 100 - 1)) {
-        htmlStartCloseIndex[indx++] = &htmlStartClose[i];
+        htmlStartCloseIndex[indx++] = (const char**) &htmlStartClose[i];
 	while (htmlStartClose[i] != NULL) i++;
 	i++;
     }
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 55a674da..cd9f4ef2 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -9,6 +9,7 @@ examples.xml: index.py *.c
 	-@($(srcdir)/index.py)
 
 index.html: examples.xml examples.xsl
+	-@(touch index.html)
 	-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
 
 install-data-local: 
diff --git a/encoding.c b/encoding.c
index 6dee212e..ee33df1a 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1613,6 +1613,12 @@ xmlFindCharEncodingHandler(const char *name) {
     /* check whether iconv can handle this */
     icv_in = iconv_open("UTF-8", name);
     icv_out = iconv_open(name, "UTF-8");
+    if (icv_in == (iconv_t) -1) {
+        icv_in = iconv_open("UTF-8", upper);
+    }
+    if (icv_out == (iconv_t) -1) {
+	icv_out = iconv_open(upper, "UTF-8");
+    }
     if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) {
 	    enc = (xmlCharEncodingHandlerPtr)
 	          xmlMalloc(sizeof(xmlCharEncodingHandler));