diff --git a/ChangeLog b/ChangeLog
index 2f1b62a1a..3df86d6f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
    ncsa.uiuc.edu; ok tim@
  - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh
    will clean up anyway.  From tim@
+ - (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running
+   "make tests" works even if you'r building on a filesystem that doesn't
+   support sockets.  From deengert at anl.gov, ok djm@
 
 20050424
  - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or
@@ -2459,4 +2462,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.3749 2005/04/25 04:49:48 dtucker Exp $
+$Id: ChangeLog,v 1.3750 2005/04/25 07:01:26 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b346b096e..a172e5790 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,7 +1,7 @@
 #	$OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $
 #	Placed in the Public Domain.
 
-CTL=$OBJ/ctl-sock
+CTL=/tmp/openssh.regress.ctl-sock.$$
 
 tid="connection multiplexing"