diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 400b67e7a..ee7b7a459 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tty.cc (fhandler_pty_slave::fch_close_handles): Don't close
+	handles not opened via fhandler_pty_slave::fch_open_handles.
+
 2015-04-22  Takashi Yano  <takashi.yano@nifty.ne.jp>
 
 	* fhandler.h (class fhandler_base): Add virtual function
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index d6b2e194d..e91b3e398 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1140,9 +1140,6 @@ fhandler_pty_slave::fch_set_sd (security_descriptor &sd, bool chown)
 void
 fhandler_pty_slave::fch_close_handles ()
 {
-  close_maybe (get_io_handle ());
-  close_maybe (get_output_handle ());
-  close_maybe (get_output_handle_cyg ());
   close_maybe (input_available_event);
   close_maybe (output_mutex);
   close_maybe (input_mutex);