diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index f7d4c768..f9c0fc37 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -10,6 +10,9 @@
   * src/part/part.c (part_print): Use const markings with const strings.
   * src/cmd/include.c (cmd_include_or_script_run): Likewise.
 
+  * sysdep.h: Redirect swprintf() calls to _snwprintf() for Windows as they
+    implemented a different function from ISO C (theirs does not take a count).
+
 2009-01-19  Kolja Waschk <kawk>
 
   * doc/UrJTAG.txt,
diff --git a/jtag/sysdep.h b/jtag/sysdep.h
index f6c6db6d..094f30e2 100644
--- a/jtag/sysdep.h
+++ b/jtag/sysdep.h
@@ -48,6 +48,9 @@
 #include <windows.h>
 #define geteuid() 0
 #define getuid() 0
+/* Microsoft uses a different swprintf() than ISO C requires */
+#include <stdio.h>
+#define swprintf _snwprintf
 #endif
 
 #endif /* SYSDEP_H */