diff --git a/agent/ChangeLog b/agent/ChangeLog
index c18e9e5e4..721abac02 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-13  Marcus Brinkmann  <marcus@g10code.com>
 
+	* gpg-agent.c (start_connection_thread)
+	(start_connection_thread_ssh): Cast npth_self result to unsigned
+	long for safety.
+
 	* cache.c (new_data): Fix error check.
 
 	* cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c,
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index abd24415c..30ec1d360 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1778,19 +1778,19 @@ start_connection_thread (void *arg)
 
   if (check_nonce (ctrl, &socket_nonce))
     {
-      log_error ("handler 0x%lx nonce check FAILED\n", npth_self());
+      log_error ("handler 0x%lx nonce check FAILED\n", (unsigned long) npth_self());
       return NULL;
     }
 
   agent_init_default_ctrl (ctrl);
   if (opt.verbose)
     log_info (_("handler 0x%lx for fd %d started\n"),
-              npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
   start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
   if (opt.verbose)
     log_info (_("handler 0x%lx for fd %d terminated\n"),
-              npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
   agent_deinit_default_ctrl (ctrl);
   xfree (ctrl);
@@ -1810,12 +1810,12 @@ start_connection_thread_ssh (void *arg)
   agent_init_default_ctrl (ctrl);
   if (opt.verbose)
     log_info (_("ssh handler 0x%lx for fd %d started\n"),
-              npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
   start_command_handler_ssh (ctrl, ctrl->thread_startup.fd);
   if (opt.verbose)
     log_info (_("ssh handler 0x%lx for fd %d terminated\n"),
-              npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
   agent_deinit_default_ctrl (ctrl);
   xfree (ctrl);