diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 34a44682b..3a83a5981 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-17  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* tty.cc (tty_list::init): Move hmaster initialization earlier to
+	prevent compilation error.
+
 2004-05-17  Christopher Faylor  <cgf@alum.bu.edu>
 
 	Change the name "title_mutex" to "tty_mutex" throughout.
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 6ced84bb0..fd8132c3a 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -200,6 +200,7 @@ tty_list::allocate_tty (bool with_console)
 {
   HWND console;
   int freetty = -1;
+  HANDLE hmaster = NULL;
 
   /* FIXME: This whole function needs a protective mutex. */
 
@@ -237,7 +238,6 @@ tty_list::allocate_tty (bool with_console)
 	}
     }
 
-  HANDLE hmaster = NULL;
   /* Is a tty allocated for console? */
   for (int i = 0; i < NTTYS; i++)
     {