diff --git a/ChangeLog b/ChangeLog
index cf92dd30..b9381eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 23 15:42:24 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* python/libxml.c python/setup.py.in: patch from Stéphane Bidoul
+	  for Python 2.1
+
 Sun Dec 22 11:24:06 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* testC14N.c vms/config.vms: applied Craig A. Berry patches for VMS
diff --git a/python/libxml.c b/python/libxml.c
index 55bee241..b48389ba 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -25,6 +25,10 @@
 #include "libxml_wrap.h"
 #include "libxml2-py.h"
 
+#if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(vsnprintf)
+#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#endif
+
 /* #define DEBUG */
 /* #define DEBUG_SAX */
 /* #define DEBUG_XPATH */
diff --git a/python/setup.py.in b/python/setup.py.in
index cca1f040..f1c09b00 100755
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -209,7 +209,11 @@ if missing("MANIFEST"):
 
 if WITHDLLS:
     ext_package = "libxmlmods"
-    data_files = [("lib/site-packages/libxmlmods",dlls)]
+    if sys.version >= "2.2":
+        base = "lib/site-packages/"
+    else:
+        base = ""
+    data_files = [(base+"libxmlmods",dlls)]
 else:
     ext_package = None
     data_files = []