diff --git a/ChangeLog b/ChangeLog
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1f628a6e3e..39608d8884 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2002-08-31  Tor Lillqvist  <tml@iki.fi>
 
+	* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
+	/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
+	is implemented (in GLib) only on native Win32. (#91683, Masahiro
+	Sakai)
+
 	* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
 	(translate_win32_path, get_real_filename): Use
 	cygwin_conv_to_posix_path().
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 45acf299d3..0b3bbbdeec 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -44,6 +44,11 @@
 #include "gdkinput-win32.h"
 #include "gdkkeysyms.h"
 
+#ifdef G_WITH_CYGWIN
+#include <fcntl.h>
+#include <errno.h>
+#endif
+
 #include <objbase.h>
 
 #if defined (__GNUC__) && defined (HAVE_DIMM_H)
@@ -303,7 +308,13 @@ _gdk_events_init (void)
   source = g_source_new (&event_funcs, sizeof (GSource));
   g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
+#ifdef G_WITH_CYGWIN
+  event_poll_fd.fd = open ("/dev/windows", O_RDONLY);
+  if (event_poll_fd.fd == -1)
+    g_error ("can't open \"/dev/windows\": %s", g_strerror (errno));
+#else
   event_poll_fd.fd = G_WIN32_MSG_HANDLE;
+#endif
   event_poll_fd.events = G_IO_IN;
   
   g_source_add_poll (source, &event_poll_fd);