diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 74484834..c68b6cab 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-17  Werner Koch  <wk@g10code.com>
+
+	* w32-glib-io.c (_gpgme_io_fd2str): Use "%d" and not "%ld" to work
+	around a bug in mingw32.
+
 2008-09-23  Marcus Brinkmann  <marcus@g10code.com>
 
 	* gpgme.c (gpgme_sig_notation_clear): Clear CTX->sig_notations.
diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c
index 9381b2e6..f4afc7e1 100644
--- a/gpgme/w32-glib-io.c
+++ b/gpgme/w32-glib-io.c
@@ -143,7 +143,7 @@ _gpgme_io_fd2str (char *buf, int buflen, int fd)
 {
   TRACE_BEG1 (DEBUG_SYSIO, "_gpgme_io_fd2str", fd, "fd=%d", fd);
   TRACE_SUC1 ("syshd=%p", _get_osfhandle (fd));
-  return snprintf (buf, buflen, "%ld", (long) _get_osfhandle (fd));
+  return snprintf (buf, buflen, "%d", (int) _get_osfhandle (fd));
 }