diff --git a/README.md b/README.md
index ed9e3def..68ef4bbd 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,8 @@ See the [GLFW 3.0 documentation](http://www.glfw.org/docs/3.0/).
 
  - Bugfix: The wrong name was used for the CMake variable for the Xxf86vm
            library
+ - [Cocoa] Bugfix: `glfwGetFramebufferSize` return the size in screen
+                   coordinates
  - [Win32] Bugfix: Context creation was attempted even if no valid pixel formats
                    had been found
  - [X11] Bugfix: Duplicate window position and window and framebuffer size
@@ -154,6 +156,7 @@ skills.
  - Stefan Gustavson
  - Sylvain Hellegouarch
  - heromyth
+ - Paul Holden
  - Toni Jovanoski
  - Osman Keskin
  - Cameron King
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index eea86335..d338e17b 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -942,7 +942,13 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
 
 void _glfwPlatformGetFramebufferSize(_GLFWwindow* window, int* width, int* height)
 {
-    _glfwPlatformGetWindowSize(window, width, height);
+    const NSRect contentRect = [window->ns.view frame];
+    const NSRect fbRect = [window->ns.view convertRectToBacking:contentRect];
+
+    if (width)
+        *width = (int) fbRect.size.width;
+    if (height)
+        *height = (int) fbRect.size.height;
 }
 
 void _glfwPlatformIconifyWindow(_GLFWwindow* window)