diff --git a/CREDITS b/CREDITS
index 95fc7c160..3539addc3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -25,9 +25,10 @@ Gary E. Miller <gem@rellim.com> - SCO support
 Ged Lodder <lodder@yacc.com.au> - HPUX fixes and enhancements
 Gert Doering <gd@hilb1.medat.de> - bug and portability fixes
 HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp> - Translations & doc fixes
-Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp> - IPv6 fixes
+Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp> - IPv6 and bug fixes
 Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp> - Configure fixes
 Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> - KRB4/AFS config patch
+IWAMURO Motonori <iwa@mmp.fujitsu.co.jp> - bugfixes
 Jani Hakala <jahakala@cc.jyu.fi> - Patches
 Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes
 Jim Knoble <jmknoble@pobox.com> - Many patches
diff --git a/ChangeLog b/ChangeLog
index 2899a4c4c..a87f32b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20000531
  - Cleanup of auth.c, login.c and fake-*
  - Cleanup of auth-pam.c, save and print "account expired" error messages
+ - Fix EGD read bug by IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
 
 20000530
  - Define atexit for old Solaris
diff --git a/entropy.c b/entropy.c
index cc7e81527..ffadd32c7 100644
--- a/entropy.c
+++ b/entropy.c
@@ -35,7 +35,7 @@
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 
-RCSID("$Id: entropy.c,v 1.11 2000/05/17 12:08:30 damien Exp $");
+RCSID("$Id: entropy.c,v 1.12 2000/05/31 01:24:34 damien Exp $");
 
 #ifdef EGD_SOCKET
 #ifndef offsetof
@@ -82,8 +82,6 @@ void get_random_bytes(unsigned char *buf, int len)
 	c = atomicio(read, egd_socket, buf, len);
 	if (c <= 0)
 		fatal("Couldn't read from EGD socket \"%s\": %s", EGD_SOCKET, strerror(errno));
-	
-	close(EGD_SOCKET);
 }
 #else /* !EGD_SOCKET */
 #ifdef RANDOM_POOL