diff --git a/ChangeLog b/ChangeLog
index 7250dd68d..b91be9ded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      [regress/test-exec.sh]
      Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding
      arbitary options to sshd_config and ssh_config during tests.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/06/22 22:55:56
+     [regress/dynamic-forward.sh regress/test-exec.sh]
+     Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1382,4 +1385,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.3435 2004/06/22 23:25:02 dtucker Exp $
+$Id: ChangeLog,v 1.3436 2004/06/22 23:28:20 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 3a6e5c1ef..392fc1978 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -3,8 +3,8 @@
 
 tid="dynamic forwarding"
 
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
+
 DATA=/bin/ls${EXEEXT}
 
 if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a184c16d1..b0ac64e9e 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,9 +1,14 @@
 #	$OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
 #	Placed in the Public Domain.
 
-PORT=4242
 #SUDO=sudo
 
+if [ ! -z "$TEST_SSH_PORT" ]; then
+	PORT="$TEST_SSH_PORT"
+else
+	PORT=4242
+fi
+
 if [ -x /usr/ucb/whoami ]; then
 	USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then