diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 5030dd02..3ca9302d 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-03  Marcus Brinkmann  <marcus@g10code.de>
+
+	* w32-glib-io.c (_gpgme_io_close): Only close fd if there is no
+	channel for it.
+
 2005-12-31  Marcus Brinkmann  <marcus@g10code.de>
 
 	* w32-glib-io.c (find_channel): Set channel to unbuffered.
diff --git a/gpgme/w32-glib-io.c b/gpgme/w32-glib-io.c
index 5c116603..7dd57402 100644
--- a/gpgme/w32-glib-io.c
+++ b/gpgme/w32-glib-io.c
@@ -287,8 +287,8 @@ _gpgme_io_close (int fd)
       g_io_channel_unref (chan);
       giochannel_table[fd] = NULL;
     }
-
-  _close (fd);
+  else
+    _close (fd);
 
   return 0;
 }