diff --git a/readme.html b/readme.html
index 96a892a2..12e2e88a 100644
--- a/readme.html
+++ b/readme.html
@@ -305,6 +305,7 @@ version of GLFW.</p>
   <li>Bugfix: The FSAA test did not check for the availability of <code>GL_ARB_multisample</code></li>
   <li>[Cocoa] Added support for OpenGL 3.2 core profile in 10.7 Lion and above</li>
   <li>[Cocoa] Bugfix: The loop condition for saving video modes used the wrong index variable</li>
+  <li>[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash</li>
   <li>[X11] Added support for the <code>GLX_EXT_swap_control</code> extension as an alternative to <code>GLX_SGI_swap_control</code></li>
   <li>[X11] Bugfix: Calling <code>glXCreateContextAttribsARB</code> with an unavailable OpenGL version caused the application to terminate with a <code>BadMatch</code> Xlib error</li>
   <li>[Win32] Removed explicit support for versions of Windows older than Windows XP</li>
diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index abd4630f..2455d594 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -201,6 +201,15 @@ int _glfwPlatformInit(void)
     // Implicitly create shared NSApplication instance
     [GLFWApplication sharedApplication];
 
+    _glfwLibrary.NS.OpenGLFramework =
+        CFBundleGetBundleWithIdentifier( CFSTR( "com.apple.opengl" ) );
+    if (_glfwLibrary.NS.OpenGLFramework == NULL)
+    {
+        _glfwSetError(GLFW_PLATFORM_ERROR,
+                      "glfwInit: Failed to locate OpenGL framework");
+        return GL_FALSE;
+    }
+
     NSString* resourcePath = [[NSBundle mainBundle] resourcePath];
 
     if (access([resourcePath cStringUsingEncoding:NSUTF8StringEncoding], R_OK) == 0)