diff --git a/ChangeLog b/ChangeLog
index bb7fda998..8bf6d4738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20010213
  - (bal) added NeXT work around for bsd-snprintf.c in bsd-nextstep.h.
  - (bal) added TODO item to clean up and sort out 'varargs' from 'stdargs'
+ - (djm) Only test -S potential EGD sockets if they exist and are readable.
 
 20010212
  - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1", 
@@ -3908,4 +3909,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.750 2001/02/12 15:57:18 mouring Exp $
+$Id: ChangeLog,v 1.751 2001/02/13 01:11:17 djm Exp $
diff --git a/configure.in b/configure.in
index fcb822840..b52448f46 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.235 2001/02/12 07:29:45 mouring Exp $
+# $Id: configure.in,v 1.236 2001/02/13 01:11:17 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -1092,7 +1092,7 @@ AC_ARG_WITH(egd-pool,
 			AC_MSG_CHECKING(for PRNGD/EGD socket)
 			# Insert other locations here
 			for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
-				if $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
+				if test -r $egdsock && $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
 					EGD_SOCKET="$egdsock"
 					AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
 					break;