diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 98f81a02..dadf512d 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-11  Marcus Brinkmann  <marcus@g10code.de>
+
+	* w32-io.c (_gpgme_io_select): Fix loop increment.
+
 2005-05-05  Marcus Brinkmann  <marcus@g10code.de>
 
 	* data-user.c (user_release): Only call user hook if provided.
diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c
index 4e62aaf1..431acbe9 100644
--- a/gpgme/w32-io.c
+++ b/gpgme/w32-io.c
@@ -1085,7 +1085,7 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds, int nonblock )
             int k, j = handle_to_fd (waitbuf[i]);
                     
             DEBUG1 ("WFMO invalid handle %d removed\n", j);
-            for (k=0 ; k < nfds; i++ ) {
+            for (k=0 ; k < nfds; k++ ) {
                 if ( fds[k].fd == j ) {
                     fds[k].for_read = fds[k].for_write = 0;
                     goto restart;