diff --git a/ChangeLog b/ChangeLog
index 330a63471214ec88a7c8737e46b08bfdc0dbeeb6..1d587f1228a77569c6f32d696d645e51b82bbb24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 28 18:36:08 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+	* libxml.3: tiny fix from Albert Chin
+	* runsuite.c runtest.c testapi.c: portability cleanup for arch
+	  needing trio for *printf
+
 Fri Oct 28 12:21:39 EDT 2005 Rob Richards <rrichards@ctindustries.net>
 
 	* tree.c: add additional checks to prevent tree corruption. fix problem 
diff --git a/libxml.3 b/libxml.3
index d46756f950ecc48ff6c6ad48a14ae24057f4744c..88d3eee286c05576dbf65a4152285e97d4c653a1 100644
--- a/libxml.3
+++ b/libxml.3
@@ -53,7 +53,7 @@ library exports Push and Pull type parser interfaces for both XML and
 static library
 .TP
 .B /depot/lib/libxml_2.0.0/libxml.so
-shareable library
+shared library
 .TP
 .B /depot/package/libxml_2.0.0/bin/xmllint
 binary application for parsing XML files
diff --git a/runsuite.c b/runsuite.c
index aecd6ae71c90ef733a78add385e2277103895f51..280c0880e8ebe0b44f0c8028c3df8b70fe5fd082 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -6,11 +6,16 @@
  * daniel@veillard.com
  */
 
+#ifdef HAVE_CONFIG_H
+#include "libxml.h"
+#else
+#include <stdio.h>
+#endif
+
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/runtest.c b/runtest.c
index dff53c3a25c7f95002287ef47d7c7faf33b5df45..947d29ff7170cb798a51b3af073a13067ba85bb3 100644
--- a/runtest.c
+++ b/runtest.c
@@ -11,11 +11,16 @@
  * daniel@veillard.com
  */
 
+#ifdef HAVE_CONFIG_H
+#include "libxml.h"
+#else
+#include <stdio.h>
+#endif
+
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/testapi.c b/testapi.c
index c11ec9d6da5e93ff6e655cd19e9b87d464f2b6ae..eefc2891c1345985e8ed508bbfe8738c95c1f8e7 100644
--- a/testapi.c
+++ b/testapi.c
@@ -8,13 +8,12 @@
  * daniel@veillard.com
  */
 
-#include "config.h"
-#ifndef	WITH_TRIO
- #include <stdio.h>
+#ifdef HAVE_CONFIG_H
+#include "libxml.h"
 #else
- #define TRIO_REPLACE_STDIO
- #include "trio.h"
+#include <stdio.h>
 #endif
+
 #include <string.h>
 #include <libxml/xmlerror.h>
 #include <libxml/relaxng.h>