diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index f34610e..5fb2ba2 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -410,7 +410,7 @@ Defaulting color scheme to 'NoColor'"""
             %gui gtk     # enable PyGTK event loop integration
             %gui gtk3    # enable Gtk3 event loop integration
             %gui tk      # enable Tk event loop integration
-            %gui OSX     # enable Cocoa event loop integration
+            %gui osx     # enable Cocoa event loop integration
                          # (requires %matplotlib 1.1)
             %gui         # disable all event loop integration
 
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 14e84bd..8181fbd 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -165,8 +165,8 @@ class InteractiveShellApp(Configurable):
     module_to_run = Unicode('', config=True,
         help="Run the module as a script."
     )
-    gui = CaselessStrEnum(('qt', 'wx', 'gtk', 'glut', 'pyglet'), config=True,
-        help="Enable GUI event loop integration ('qt', 'wx', 'gtk', 'glut', 'pyglet')."
+    gui = CaselessStrEnum(('qt', 'wx', 'gtk', 'glut', 'pyglet', 'osx'), config=True,
+        help="Enable GUI event loop integration ('qt', 'wx', 'gtk', 'glut', 'pyglet', 'osx')."
     )
     pylab = CaselessStrEnum(['tk', 'qt', 'wx', 'gtk', 'osx', 'inline', 'auto'],
         config=True,