diff --git a/ChangeLog b/ChangeLog
index e3db4a06e8..7cfa5c2322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 24 15:55:06 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* io.c (rb_fd_fix_cloexec): use rb_update_max_fd().
+
 Wed Apr 24 14:08:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* numeric.c: Fix wiki link on Float imprecision in overview, patched
diff --git a/io.c b/io.c
index 7fb49906d3..f21f6c29d3 100644
--- a/io.c
+++ b/io.c
@@ -216,9 +216,8 @@ rb_maygvl_fd_fix_cloexec(int fd)
 void
 rb_fd_fix_cloexec(int fd)
 {
-    rb_atomic_t afd = (rb_atomic_t)fd;
     rb_maygvl_fd_fix_cloexec(fd);
-    if (max_file_descriptor < afd) max_file_descriptor = afd;
+    rb_update_max_fd(fd);
 }
 
 int