diff --git a/ChangeLog b/ChangeLog
index febfc58c00..f0618e9712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  4 10:01:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (popen_exec): should not close close-on-exec FDs.
+	  [ruby-dev:30679]
+
 Tue Apr  4 04:17:18 2007  Technorama Ltd. <oss-ruby@technorama.net>
 
 	* ext/openssl/ossl_ssl.c: Add documentation.
diff --git a/io.c b/io.c
index 18ad765d85..b9a84e11e4 100644
--- a/io.c
+++ b/io.c
@@ -3040,6 +3040,9 @@ popen_exec(void *pp)
 
     popen_redirect(p);
     for (fd = 3; fd < NOFILE; fd++) {
+#ifdef FD_CLOEXEC
+	if (fcntl(fd, F_GETFD) & FD_CLOEXEC) continue;
+#endif
 	close(fd);
     }
     return rb_exec(&p->exec);