diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3aaeece54..5c1ae3ca4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 29 14:32:12 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* fhandler_console.cc: Add VK_DIVIDE detection.  Return virtual keycode
+	if it is not detected and it is less than ' '.
+
 Sat Jul 29 13:33:49 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* path.cc (chdir): Avoid trailing dot calculation when chdir == '/'
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 7e266ab8d..5ee8e9a58 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1297,6 +1297,8 @@ static struct {
   {VK_NUMPAD5,	{"\033[G",	NULL,		NULL,		NULL}},
   {VK_CLEAR,	{"\033[G",	NULL,		NULL,		NULL}},
   {'6',		{NULL,		NULL,		"\036",		NULL}},
+  /* FIXME: Should this be \033OQ? */
+  {VK_DIVIDE,	{"/",		"/",		"/",		"/"}},
   {0,		{"",		NULL,		NULL,		NULL}}
 };
 
@@ -1322,6 +1324,13 @@ get_nonascii_key (INPUT_RECORD& input_rec)
     if (input_rec.Event.KeyEvent.wVirtualKeyCode == keytable[i].vk)
       return keytable[i].val[modifier_index];
 
+  if (input_rec.Event.KeyEvent.wVirtualKeyCode < ' ')
+    {
+      /* FIXME: Probably not thread-safe */
+      static char buf[2];
+      buf[0] = input_rec.Event.KeyEvent.wVirtualKeyCode;
+      return buf;
+    }
   return NULL;
 }