diff --git a/ChangeLog b/ChangeLog
index 5a7ee6a0b..5da85bea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20031021
  - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
    directly.  Noted by Darren.Moffat at sun.com.
+ - (dtucker) [regress/agent-ptrace.sh] Skip agent-test unless SUDO is set,
+   make agent setgid during test.
 
 20031017
  - (dtucker) [INSTALL] Note that --with-md5 is now required on platforms with
@@ -1369,4 +1371,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3084 2003/10/21 02:41:14 dtucker Exp $
+$Id: ChangeLog,v 1.3085 2003/10/21 12:27:08 dtucker Exp $
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index cd9c0023d..66c8dbc58 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -5,7 +5,7 @@ tid="disallow agent ptrace attach"
 
 if have_prog uname ; then
 	case `uname` in
-	Linux|HP-UX|SunOS|NetBSD|AIX|CYGWIN*)
+	CYGWIN*)
 		echo "skipped (not supported on this platform)"
 		exit 0
 		;;
@@ -19,6 +19,15 @@ else
 	exit 0
 fi
 
+if test -z "$SUDO" ; then
+	echo "skipped (SUDO not set)"
+	exit 0
+else
+	$SUDO chown root ${OBJ}${SSHAGENT}
+	$SUDO chgrp root ${OBJ}${SSHAGENT}
+	$SUDO chmod 2755 ${OBJ}${SSHAGENT}
+fi
+
 trace "start agent"
 eval `${SSHAGENT} -s` > /dev/null
 r=$?