diff --git a/tools/ChangeLog b/tools/ChangeLog
index aa1151290..924e11017 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -6,6 +6,10 @@
 	(symcryptrun_SOURCES, symcryptrun_LDADD): New variables.
 	* symcryptrun.c: New file.
 
+2005-03-31  Werner Koch  <wk@g10code.com>
+
+	* gpg-connect-agent.c (start_agent): Use PATHSEP_C instead of ':'.
+
 2005-03-09  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c <dirmngr>: Add honor-http-proxy.
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 19ff160f0..6372954f6 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -325,7 +325,7 @@ read_and_print_response (assuan_context_t ctx)
 
 
 
-/* Connect to teh agebnt and send the standard options.  */
+/* Connect to the agent and send the standard options.  */
 static assuan_context_t
 start_agent (void)
 {
@@ -357,7 +357,7 @@ start_agent (void)
         }
       *p++ = 0;
       pid = atoi (p);
-      while (*p && *p != ':')
+      while (*p && *p != PATHSEP_C)
         p++;
       prot = *p? atoi (p+1) : 0;
       if (prot != 1)