diff --git a/ChangeLog b/ChangeLog
index f9db29ad5..5d6982ff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050823
+ - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully-
+   qualified sshd pathname since some systems (eg Cygwin) may consider "/foo"
+   and "//foo" to be different.  Spotted by vinschen at redhat.com.
+
 20050821
  - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for
    LynxOS, patch from Olli Savia (ops at iki.fi).  ok djm@
@@ -2945,4 +2950,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3875 2005/08/22 22:06:55 dtucker Exp $
+$Id: ChangeLog,v 1.3876 2005/08/23 13:32:05 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index bd0c025ba..4b3a70eb3 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -96,9 +96,10 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
 fi
 
 # Path to sshd must be absolute for rexec
-if [ ! -x /$SSHD ]; then
-	SSHD=`which sshd`
-fi
+case "$SSHD" in
+/*) ;;
+*) SSHD=`which sshd` ;;
+esac
 
 if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
 	TEST_SSH_LOGFILE=/dev/null