diff --git a/agent/ChangeLog b/agent/ChangeLog
index 0fdcd92d1..9d1a9a03f 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-04  Marcus Brinkmann  <marcus@g10code.com>
+
+	* command.c (start_command_handler): Add comment about gap in
+	implementation (in dead code), for future reference.
+
 2009-08-11  Werner Koch  <wk@g10code.com>
 
 	* divert-scd.c (ask_for_card): I18n a prompt string.
diff --git a/agent/command.c b/agent/command.c
index 90a7f3437..e893aea1e 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1895,6 +1895,8 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
   else if (listen_fd != GNUPG_INVALID_FD)
     {
       rc = assuan_init_socket_server_ext (&ctx, listen_fd, 0);
+      /* FIXME: Need to call assuan_sock_set_nonce for Windows.  But
+	 this branch is currently not used.  */
     }
   else 
     {