diff --git a/readme.html b/readme.html
index be5c40cb..23b86b7a 100644
--- a/readme.html
+++ b/readme.html
@@ -303,6 +303,7 @@ version of GLFW.</p>
   <li>[Win32] Removed explicit support for versions of Windows older than Windows XP</li>
   <li>[Win32] Bugfix: Window activation and iconification did not work as expected</li>
   <li>[Win32] Bugfix: Software rasterizer pixel formats were not discarded by the WGL_ARB_pixel_format code path</li>
+  <li>[Win32] Bugfix: The array for WGL context attributes was too small and could overflow</li>
 </ul>
 
 <h3>v2.7</h3>
@@ -897,6 +898,8 @@ their skills.  Special thanks go out to:</p>
   <li>TTK-Bandit, for submitting a number of input patches adding many missing
   keys to the Win32 and X11 ports</li>
 
+  <li>yuriks, for reporting a bug in Win32 context creation</li>
+
   <li>All the unmentioned and anonymous contributors in the GLFW community, for
   bug reports, patches, feedback and encouragement</li>
 
diff --git a/src/win32/win32_window.c b/src/win32/win32_window.c
index b0862036..fd751da2 100644
--- a/src/win32/win32_window.c
+++ b/src/win32/win32_window.c
@@ -323,7 +323,7 @@ static GLboolean createContext(_GLFWwindow* window,
                                int pixelFormat)
 {
     PIXELFORMATDESCRIPTOR pfd;
-    int i = 0, attribs[7];
+    int i = 0, attribs[9];
     HGLRC share = NULL;
 
     if (wndconfig->share)