diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index beb1fd7b4..5d0cbd138 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* fhandler_termios.cc (tty_min::kill_pgrp): Don't send __SIGSETPGRP
+	since presumably we are already initialized.
+
 2011-12-07  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
 	* select.cc (cygwin_select): Add common introducer and leaver debug
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 3d77c55bc..7dc5bf58c 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -114,7 +114,7 @@ fhandler_pty_master::tcgetpgrp ()
 void
 tty_min::kill_pgrp (int sig)
 {
-  int killself = 0;
+  bool killself = false;
   winpids pids ((DWORD) PID_MAP_RW);
   siginfo_t si = {0};
   si.si_signo = sig;
@@ -125,7 +125,7 @@ tty_min::kill_pgrp (int sig)
       if (!p->exists () || p->ctty != ntty || p->pgid != pgid)
 	continue;
       if (p == myself)
-	killself++;
+	killself = sig != __SIGSETPGRP;
       else
 	sig_send (p, si);
     }