diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4e55b540d..5eef80c2c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-20  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_tty.cc (fhandler_tty::close): Remove problematic hExeced guard.
+
 2006-05-20  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_tty.cc (fhandler_tty_slave::open): Reinstate call to
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 19759247a..853972840 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -598,22 +598,24 @@ out:
 int
 fhandler_tty_slave::close ()
 {
-  if (!hExeced)
+  /* This used to always call fhandler_tty_common::close when hExeced but that
+     caused multiple closes of the handles associated with this tty.  Since
+     close_all_files is not called until after the cygwin process has synced
+     or before a non-cygwin process has exited, it should be safe to just
+     close this normally.  cgf 2006-05-20 */
+  cygheap->manage_console_count ("fhandler_tty_slave::close", -1);
+
+  archetype->usecount--;
+  report_tty_counts (this, "closed", "");
+
+  if (archetype->usecount)
     {
-      cygheap->manage_console_count ("fhandler_tty_slave::close", -1);
-
-      archetype->usecount--;
-      report_tty_counts (this, "closed", "");
-
-      if (archetype->usecount)
-	{
 #ifdef DEBUGGING
-	  if (archetype->usecount < 0)
-	    system_printf ("error: usecount %d", archetype->usecount);
+      if (archetype->usecount < 0)
+	system_printf ("error: usecount %d", archetype->usecount);
 #endif
-	  termios_printf ("just returning because archetype usecount is != 0");
-	  return 0;
-	}
+      termios_printf ("just returning because archetype usecount is != 0");
+      return 0;
     }
 
   termios_printf ("closing last open %s handle", ttyname ());