diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bf1cda119..473c8f58f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug  7 01:13:58 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* fhandler_console.cc (get_tty_stuff): Don't initialize shared memory
+	console area if it is already initialized.
+
+	* fhandler_termios.cc (fhandler_termios::tcsetpgrp): Augment debugging
+	info.
+
 Mon Aug  6 19:58:43 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* cygheap.cc (cygheap_root::set): Avoid treating '/' specially.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index e9b1c49f4..1b3b0270c 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -107,9 +107,12 @@ get_tty_stuff (int flags = 0)
 						 sizeof (*shared_console_info),
 						 NULL);
   ProtectHandle (cygheap->console_h);
-  shared_console_info->setntty (TTY_CONSOLE);
-  shared_console_info->setsid (myself->sid);
-  shared_console_info->set_ctty (TTY_CONSOLE, flags);
+  if (!shared_console_info->ntty)
+    {
+      shared_console_info->setntty (TTY_CONSOLE);
+      shared_console_info->setsid (myself->sid);
+      shared_console_info->set_ctty (TTY_CONSOLE, flags);
+    }
   return shared_console_info;
 }
 
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 606c689ca..4a8c23862 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -65,7 +65,7 @@ fhandler_termios::tcinit (tty_min *this_tc, int force)
 int
 fhandler_termios::tcsetpgrp (const pid_t pgid)
 {
-  termios_printf ("pgid %d, sid %d, tsid %d", pgid,
+  termios_printf ("tty %d pgid %d, sid %d, tsid %d", tc->ntty, pgid,
 		    myself->sid, tc->getsid ());
   if (myself->sid != tc->getsid ())
     {