diff --git a/src/ChangeLog b/src/ChangeLog
index 73a62fe3..4afcdf98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-03  Marcus Brinkmann  <marcus@g10code.com>
+
+	* w32-io.c (_gpgme_io_socket): Return fd, not res.
+
 2011-02-02  Marcus Brinkmann  <mb@g10code.com>
 
 	* assuan-support.c (my_socket, my_connect): New functions.
diff --git a/src/w32-io.c b/src/w32-io.c
index 10e0dade..56a05c4b 100644
--- a/src/w32-io.c
+++ b/src/w32-io.c
@@ -2035,7 +2035,7 @@ _gpgme_io_socket (int domain, int type, int proto)
 
   TRACE_SUC2 ("socket=0x%x (0x%x)", fd, fd_table[fd].socket);
   
-  return res;
+  return fd;
 }