diff --git a/common/ChangeLog b/common/ChangeLog
index 6ec45823d..e3d8f8b5a 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* 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
+	declaration.
+
 2009-12-07  Werner Koch  <wk@g10code.com>
 
 	* pka.c (get_pka_info): Add support for ADNS.
diff --git a/common/asshelp.c b/common/asshelp.c
index e5a3f8c1f..09ef10ba8 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -247,7 +247,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
                 /* Give the agent some time to prepare itself. */
                 gnupg_sleep (3);
                 /* Now try again to connect the agent.  */
-                rc = assuan_socket_connect (ctx, sockname, 0);
+                rc = assuan_socket_connect (ctx, sockname, 0, 0);
               }
           }
 #else /*!HAVE_W32_SYSTEM*/
diff --git a/common/iobuf.c b/common/iobuf.c
index 60e50d677..0d2a5a5ba 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -1266,7 +1266,7 @@ iobuf_is_pipe_filename (const char *fname)
    "rb" if FNAME is used.  In contrast to iobuf_fdopen the file
    descriptor FD will not be closed during an iobuf_close.  */
 iobuf_t
-iobuf_open_fd_or_name (int fd, const char *fname, const char *mode)
+iobuf_open_fd_or_name (gnupg_fd_t fd, const char *fname, const char *mode)
 {
   iobuf_t a;