diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index acf5e90f9..6b9d56f1f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tty.cc (fhandler_pty_master::setup): Create pty pipes
+	non-inheritable.
+
 2011-06-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_tty.cc (fhandler_pty_master::setup): Fix crash in debug
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index a03fddbdc..70b7993b6 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1586,7 +1586,7 @@ fhandler_pty_master::setup ()
   /* Create communication pipes */
   char pipename[sizeof("ptyNNNN-from-master")];
   __small_sprintf (pipename, "pty%d-from-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_none, from_master,
+  res = fhandler_pipe::create_selectable (&sec_none_nih, from_master,
 					  get_output_handle (), 128 * 1024,
 					  pipename);
   if (res)
@@ -1600,7 +1600,7 @@ fhandler_pty_master::setup ()
 		    get_output_handle ());
 
   __small_sprintf (pipename, "pty%d-to-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_none, get_io_handle (),
+  res = fhandler_pipe::create_selectable (&sec_none_nih, get_io_handle (),
 					  to_master, 128 * 1024, pipename);
   if (res)
     {