diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 38584e0c5..bf0643353 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tty.cc (fhandler_tty_slave::open):  Don't expect that
+	service applications have no window station attached.
+
 2005-11-16  Christopher Faylor  <cgf@timesys.com>
 
 	* times.cc (hires_ms::prime): Don't escalate the priority.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 3bf524e11..559819fee 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -577,15 +577,18 @@ fhandler_tty_slave::open (int flags, mode_t)
   set_open_status ();
   if (cygheap->manage_console_count ("fhandler_tty_slave::open", 1) == 1
       && !GetConsoleCP () && !output_done_event
-      && wincap.pty_needs_alloc_console () && !GetProcessWindowStation ())
+      && wincap.pty_needs_alloc_console ())
     {
       BOOL b;
-      HWINSTA h = CreateWindowStation (NULL, 0, GENERIC_READ | GENERIC_WRITE, &sec_none_nih);
-      termios_printf ("CreateWindowStation %p, %E", h);
-      if (h)
-	{
-	  b = SetProcessWindowStation (h);
-	  termios_printf ("SetProcessWindowStation %d, %E", b);
+      if (!GetProcessWindowStation ())
+        {
+	  HWINSTA h = CreateWindowStation (NULL, 0, GENERIC_READ | GENERIC_WRITE, &sec_none_nih);
+	  termios_printf ("CreateWindowStation %p, %E", h);
+	  if (h)
+	    {
+	      b = SetProcessWindowStation (h);
+	      termios_printf ("SetProcessWindowStation %d, %E", b);
+	    }
 	}
       b = AllocConsole ();	// will cause flashing if workstation
 				// stuff fails