diff --git a/ChangeLog b/ChangeLog
index 56ee3f899a..2398ea4280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 21 23:03:45 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
+	* lib/drb/extserv.rb: typo
+
 Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (envelope): allow NIL.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index e9ac40773b..80beb02443 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -903,7 +903,6 @@ module DRb
 
     def set_sockopt(soc) # :nodoc:
       soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
       soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end