diff --git a/src/ChangeLog b/src/ChangeLog
index 943e7d7e..5caddaeb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgsm.c (gpgsm_new): Close server side FDs.
+
 2009-11-06  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme-tool.c (struct gpgme_tool): New members write_data and
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 87d577bd..d1406152 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -364,9 +364,9 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir)
 
   /* assuan_pipe_connect in this case uses _gpgme_io_spawn which
      closes the child fds for us.  */
-  gpgsm->input_cb.server_fd = -1;
-  gpgsm->output_cb.server_fd = -1;
-  gpgsm->message_cb.server_fd = -1;
+  _gpgme_io_close (gpgsm->input_cb.server_fd);
+  _gpgme_io_close (gpgsm->output_cb.server_fd);
+  _gpgme_io_close (gpgsm->message_cb.server_fd);
 
   err = _gpgme_getenv ("DISPLAY", &dft_display);
   if (err)