diff --git a/CHANGES b/CHANGES
index 74a945c6a8..25f13d5b6b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 CHANGES IN FLTK 1.1.0rc7
 
+	- Fl_Glut_Window now takes keyboard focus and handles
+	  shortcut events.
+	- The MacOS X implementation of fl_ready() now checks
+	  the event queue for events.
 	- Fl_PNM_Image now supports the XV/GIMP thumbnail format
 	  (P7).
 	- Fl_Preferences would not find groups inside the root 
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx
index 4ee8c07455..6065fd37d8 100755
--- a/src/glut_compatability.cxx
+++ b/src/glut_compatability.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: glut_compatability.cxx,v 1.4.2.5.2.3 2002/08/09 03:17:30 easysw Exp $"
+// "$Id: glut_compatability.cxx,v 1.4.2.5.2.4 2002/09/19 02:53:00 easysw Exp $"
 //
 // GLUT emulation routines for the Fast Light Tool Kit (FLTK).
 //
@@ -83,6 +83,7 @@ int Fl_Glut_Window::handle(int event) {
   switch (event) {
 
   case FL_PUSH:
+    if (keyboard || special) Fl::focus(this);
     button = Fl::event_button()-1;
     if (button<0) button = 0;
     if (button>2) button = 2;
@@ -121,6 +122,9 @@ int Fl_Glut_Window::handle(int event) {
     if (keyboard || special) return 1;
     break;
 
+  case FL_SHORTCUT:
+    if (!keyboard && !special) break;
+
   case FL_KEYBOARD:
     if (Fl::event_text()[0]) {
       if (keyboard) {keyboard(Fl::event_text()[0],ex,ey); return 1;}
@@ -402,5 +406,5 @@ int glutLayerGet(GLenum type) {
 #endif
 
 //
-// End of "$Id: glut_compatability.cxx,v 1.4.2.5.2.3 2002/08/09 03:17:30 easysw Exp $".
+// End of "$Id: glut_compatability.cxx,v 1.4.2.5.2.4 2002/09/19 02:53:00 easysw Exp $".
 //