diff --git a/ChangeLog b/ChangeLog
index c33c5289c0..859710e066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 18 22:53:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
+
 Wed Feb 18 22:42:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: improt test_rinda.rb
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index f51e390808..cdc771da1f 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -99,7 +99,6 @@ module DRb
     end
 
     def set_sockopt(soc)
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK) if defined? Fcntl::O_NONBLOCK
       soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end