diff --git a/ChangeLog b/ChangeLog
index 72650894c2..10b6ad5857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 27 09:27:30 2015  Eric Wong  <e@80x24.org>
+
+	* lib/drb/drb.rb (set_sockopt): remove redundant fcntl call
+	* lib/drb/unix.rb (set_sockopt): ditto
+	  [ruby-core:69128] [Feature #11137]
+
 Tue May 26 22:10:43 2015  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* vm_method.c (rb_alias): should resolve refined methods.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 32e5bfb9e7..456d0fbfa0 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -47,7 +47,6 @@
 
 require 'socket'
 require 'thread'
-require 'fcntl'
 require 'io/wait'
 require 'drb/eq'
 
@@ -1013,7 +1012,6 @@ module DRb
 
     def set_sockopt(soc) # :nodoc:
       soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end
 
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 3fb8d0ecce..637ea7cf6f 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -108,7 +108,7 @@ module DRb
     end
 
     def set_sockopt(soc)
-      soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+      # no-op for now
     end
   end