diff --git a/agent/ChangeLog b/agent/ChangeLog
index 1c1c6e8e7..5618f06d6 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
+	* call-scd.c (start_scd): Likewise.
+
 2009-12-03  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c (set_debug): Allow for numerical debug leveles.  Print
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index c5a6f7814..46293d96e 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -304,8 +304,8 @@ start_pinentry (ctrl_t ctrl)
   if (!opt.running_detached)
     {
       if (log_get_fd () != -1)
-        no_close_list[i++] = log_get_fd ();
-      no_close_list[i++] = fileno (stderr);
+        no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+      no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
     }
   no_close_list[i] = -1;
 
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 83b99335d..f3303c11d 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -333,8 +333,8 @@ start_scd (ctrl_t ctrl)
   if (!opt.running_detached)
     {
       if (log_get_fd () != -1)
-        no_close_list[i++] = log_get_fd ();
-      no_close_list[i++] = fileno (stderr);
+        no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+      no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
     }
   no_close_list[i] = -1;
 
diff --git a/common/ChangeLog b/common/ChangeLog
index e3d8f8b5a..df058a8fe 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,5 +1,7 @@
 2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
 
+	* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
+	
 	* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
 	argument in assuan_socket_connect invocation.
 	* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
diff --git a/common/asshelp.c b/common/asshelp.c
index 09ef10ba8..b2d13f32b 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -268,8 +268,8 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
             
             i=0;
             if (log_get_fd () != -1)
-              no_close_list[i++] = log_get_fd ();
-            no_close_list[i++] = fileno (stderr);
+              no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+            no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
             no_close_list[i] = -1;
             
             /* Connect to the agent and perform initial handshaking. */
diff --git a/g13/call-gpg.c b/g13/call-gpg.c
index 6603533ab..5db284f03 100644
--- a/g13/call-gpg.c
+++ b/g13/call-gpg.c
@@ -92,12 +92,12 @@ start_gpg (ctrl_t ctrl, int input_fd, int output_fd, assuan_context_t *r_ctx)
   
   i = 0;
   if (log_get_fd () != -1)
-    no_close_list[i++] = log_get_fd ();
-  no_close_list[i++] = fileno (stderr);
+    no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+  no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
   if (input_fd != -1)
-    no_close_list[i++] = input_fd;
+    no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
   if (output_fd != -1)
-    no_close_list[i++] = output_fd;
+    no_close_list[i++] = assuan_fd_from_posix_fd (output_fd);
   no_close_list[i] = -1;
 
   /* Connect to GPG and perform initial handshaking.  */
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 39ae4df40..a96b90327 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
+
 2009-12-03  Werner Koch  <wk@g10code.com>
 
 	* gpgsm.c (set_debug): Allow for numerical debug leveles.  Print
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index b6f37bae2..ba6cf6fba 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -258,8 +258,8 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r)
 
       i=0;
       if (log_get_fd () != -1)
-        no_close_list[i++] = log_get_fd ();
-      no_close_list[i++] = fileno (stderr);
+        no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
+      no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
       no_close_list[i] = -1;
 
       /* connect to the agent and perform initial handshaking */
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 02e67f922..b839c4d5e 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
+
 2009-12-07  Werner Koch  <wk@g10code.com>
 
 	* no-libgcrypt.c (gcry_strdup): Actually copy the string.
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 895056fe7..4acda0171 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1222,8 +1222,8 @@ main (int argc, char **argv)
     {
       int no_close[3];
 
-      no_close[0] = fileno (stderr);
-      no_close[1] = log_get_fd ();
+      no_close[0] = assuan_fd_from_posix_fd (fileno (stderr));
+      no_close[1] = assuan_fd_from_posix_fd (log_get_fd ());
       no_close[2] = -1;
 
       rc = assuan_new (&ctx);