diff --git a/ChangeLog b/ChangeLog
index acb0e26dd..823a94123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
    platforms), so test if diff understands it.  Pointed out by tim@, ok djm@
+ - (dtucker) OpenBSD CVS Sync regress/
+   - dtucker@cvs.openbsd.org 2004/06/17 05:51:59
+     [regress/multiplex.sh]
+     Remove datafile between and after tests, kill sshd rather than wait;
+     ok djm@
 
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1255,4 +1260,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.3399 2004/06/17 05:18:32 dtucker Exp $
+$Id: ChangeLog,v 1.3400 2004/06/17 06:27:43 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 9940f15cb..fb4927e62 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 dtucker Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -10,11 +10,13 @@ start_sshd
 trace "start master, fork to background"
 ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
 
+rm -f $OBJ/ls.copy
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
+rm -f $OBJ/ls.copy
 trace "ssh transfer over multiplexed connection and check result"
 ${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
@@ -33,6 +35,8 @@ ${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1
 test -f $OBJ/ls.copy			|| fail "failed copy /bin/ls"
 cmp /bin/ls $OBJ/ls.copy		|| fail "corrupted copy of /bin/ls"
 
+rm -f $OBJ/ls.copy
+
 for s in 0 1 4 5 44; do
 	trace "exit status $s over multiplexed connection"
 	verbose "test $tid: status $s"
@@ -52,4 +56,6 @@ for s in 0 1 4 5 44; do
 	fi
 done
 
-sleep 30 # early close test sleeps 5 seconds per test
+# kill master, remove control socket.  ssh -MS will exit when sleep exits
+$SUDO kill `cat $PIDFILE`
+rm -f $CTL