diff --git a/CHANGES b/CHANGES
index 09cdecf15..dbff0e2b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.4
 
+	- Swapped shortcut labels in OS X (STR #86)
 	- Non-square Fl_Dial would calculate angle from user
 	  input wrong (STR #101)
 	- Updated documentatiopn of fl_draw (STR #94)
diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index 13082d5c2..43f3dd2fb 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.15 2003/07/18 03:49:58 matthiaswm Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -370,7 +370,7 @@ int Widget_Browser::handle(int e) {
     if (!title) break;
     l = (Fl_Type*)find_item(Fl::event_y());
     if (l) {
-      X += 10*l->level;
+      X += 12*l->level + 18 - hposition();
       if (l->is_parent() && Fl::event_x()>X && Fl::event_x()<X+13) ;
       else l = 0;
     }
@@ -791,5 +791,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.15 2003/07/18 03:49:58 matthiaswm Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $".
 //
diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx
index 9f56f9e7b..6a5f89859 100644
--- a/src/fl_shortcut.cxx
+++ b/src/fl_shortcut.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.11 2003/06/12 01:36:18 easysw Exp $"
+// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.12 2003/07/18 17:43:30 matthiaswm Exp $"
 //
 // Shortcut support routines for the Fast Light Tool Kit (FLTK).
 //
@@ -119,9 +119,9 @@ const char * fl_shortcut_label(int shortcut) {
 #ifdef __APPLE__
   // \todo Mac :  we might want to change the symbols for Mac users - consider drawing Apple Symbols... .
   if (shortcut & FL_SHIFT) {strcpy(p,"Shift+"); p += 6;} //: Mac hollow up arrow
-  if (shortcut & FL_META)  {strcpy(p,"Ctrl+"); p += 5;}  //: Mac 'control'
-  if (shortcut & FL_ALT)   {strcpy(p,"Option+"); p += 7;}   //: Mac 'Option' or fancy switch symbol
-  if (shortcut & FL_CTRL)  {strcpy(p,"Cmd+"); p += 4;}  //: Mac Apple or Curlyflour
+  if (shortcut & FL_META)  {strcpy(p,"Cmd+"); p += 4;}  //: Mac 'Apple' key
+  if (shortcut & FL_ALT)   {strcpy(p,"Option+"); p += 7;}   //: Mac 'Alt/Option' or fancy switch symbol
+  if (shortcut & FL_CTRL)  {strcpy(p,"Ctrl+"); p += 5;}  //: Mac ctrl key
 #else
   if (shortcut & FL_META) {strcpy(p,"Meta+"); p += 5;}
   if (shortcut & FL_ALT) {strcpy(p,"Alt+"); p += 4;}
@@ -201,5 +201,5 @@ int Fl_Widget::test_shortcut() {
 }
 
 //
-// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.11 2003/06/12 01:36:18 easysw Exp $".
+// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.12 2003/07/18 17:43:30 matthiaswm Exp $".
 //