diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e3c4e12fc..9497e2f62 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tty.cc (fhandler_pty_master::setup): Fix pipe inheritance.
+
 2008-06-18  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* strsig.cc (strsignal): Return non-const buffer to allow building with
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 9bebcd0c0..ab52d6dfe 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1362,7 +1362,7 @@ fhandler_pty_master::setup (bool ispty)
 
   char pipename[sizeof("ttyNNNN-from-master")];
   __small_sprintf (pipename, "tty%d-from-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_all_nih, from_master,
+  res = fhandler_pipe::create_selectable (&sec_all, from_master,
 					  get_output_handle (), 128 * 1024,
 					  pipename);
   if (res)
@@ -1372,7 +1372,7 @@ fhandler_pty_master::setup (bool ispty)
     }
 
   __small_sprintf (pipename, "tty%d-to-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_all_nih, get_io_handle (),
+  res = fhandler_pipe::create_selectable (&sec_all, get_io_handle (),
 					  to_master, 128 * 1024, pipename);
   if (res)
     {