diff --git a/ChangeLog b/ChangeLog
index 13f71387a2a791520aa7d88ee0a552ab390ea31b..4ef6197c83e64d5fb59025fa7733aca7a1da989c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  5 12:38:36 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
+
+	* runsuite.c runtest.c: Tiny portability adjustment for win.
+	* win32/Makefile.*: Added runtest.exe and runsuite.exe to
+	  be created.
+
 Mon Jul  4 17:44:26 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* runsuite.c: first stb at unimplemnted detection
diff --git a/runsuite.c b/runsuite.c
index 3d9d6b72b9da9b229d44034bd0f7326c92f54c52..b78831349db9695b476f60eaf79c72a8e4aae520 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -31,7 +31,12 @@
 
 #define LOGFILE "runsuite.log"
 FILE *logfile = NULL;
-int verbose = 0;
+int verbose = 0;
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
+#endif
 
 /************************************************************************
  *									*
diff --git a/runtest.c b/runtest.c
index d3dc4aaadb74109cb80ad71b7e8199b0bf63904c..63cf0d521d0d65779c4e9ac46053b83b3623b037 100644
--- a/runtest.c
+++ b/runtest.c
@@ -110,7 +110,7 @@ static int glob(const char *pattern, int flags,
     WIN32_FIND_DATA FindFileData;
     HANDLE hFind;
     unsigned int nb_paths = 0;
-    char directory[500], *tmp;
+    char directory[500];
     int len;
 
     if ((pattern == NULL) || (pglob == NULL)) return(-1);
@@ -669,11 +669,13 @@ static int loadMem(const char *filename, const char **mem, int *size) {
     while ((res = read(fd, &base[siz], info.st_size - siz)) > 0) {
         siz += res;
     }
-    close(fd);
+    close(fd);
+#if !defined(_WIN32)
     if (siz != info.st_size) {
         free(base);
 	return(-1);
-    }
+    }
+#endif
     base[siz] = 0;
     *mem = base;
     *size = siz;
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index 182e41f7e09fc8a39a63a8ab2b3c8f14d1e51321..6603d2a41aa100a03b5d5d7f2cce32b3c6a8c952 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -214,7 +214,9 @@ UTILS = $(BINDIR)\xmllint.exe\
 	$(BINDIR)\testSAX.exe\
 	$(BINDIR)\testSchemas.exe\
 	$(BINDIR)\testURI.exe\
-	$(BINDIR)\testXPath.exe
+	$(BINDIR)\testXPath.exe\
+	$(BINDIR)\runtest.exe\
+	$(BINDIR)\runsuite.exe
 
 
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index 0a4f3148af0bb6e186fca1c35d258515d68d455c..61d15ab3a7cd2001b8f9d51d3229f34715dd8fd2 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -208,7 +208,9 @@ UTILS = $(BINDIR)/xmllint.exe\
 	$(BINDIR)/testSAX.exe\
 	$(BINDIR)/testSchemas.exe\
 	$(BINDIR)/testURI.exe\
-	$(BINDIR)/testXPath.exe
+	$(BINDIR)/testXPath.exe\
+	$(BINDIR)/runtest.exe\
+	$(BINDIR)/runsuite.exe
 ifeq ($(WITH_THREADS),yes)
 UTILS += $(BINDIR)/testThreadsWin32.exe
 endif
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index f57b53c84fbdab0cfdb3a83bb4237ba32cfae9b1..f5914dbefcefb1f68708ed8f459e90194b9bead3 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -193,7 +193,9 @@ UTILS = $(BINDIR)\xmllint.exe\
 	$(BINDIR)\testSAX.exe\
 	$(BINDIR)\testSchemas.exe\
 	$(BINDIR)\testURI.exe\
-	$(BINDIR)\testXPath.exe
+	$(BINDIR)\testXPath.exe\
+	$(BINDIR)\runtest.exe\
+	$(BINDIR)\runsuite.exe
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
 UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe
 !else if "$(WITH_THREADS)" == "posix"