diff --git a/README.md b/README.md
index a3f8a8ea..9492aafb 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
 
  - Removed support for LCC and Borland C++
  - Bugfix: `glfwSetTime` silently accepted invalid values
+ - [WGL] Bugfix: The context flags debug bit was not set for OpenGL ES
  - [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full
                    screen windows
  - [X11] Added support for Cygwin-X
@@ -72,6 +73,8 @@ GLFW bundles a number of dependencies in the `deps/` directory.
  - [X11] Bugfix: Mouse button `GLFW_MOUSE_BUTTON_4` was never used
  - [X11] Bugfix: `glfwTerminate` could close an unrelated file descriptor
  - [X11] Bugfix: Some WMs (KWM, Fluxbox) did not respect cursor redefinition
+ - [GLX] Bugfix: The context flags debug bit was not set for OpenGL ES
+ - [EGL] Bugfix: The context flags debug bit was not set for OpenGL ES
 
 
 ## Contact
diff --git a/src/egl_context.c b/src/egl_context.c
index e3335a53..ca4843ee 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -339,11 +339,11 @@ int _glfwCreateContext(_GLFWwindow* window,
 
             if (ctxconfig->forward)
                 flags |= EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR;
-
-            if (ctxconfig->debug)
-                flags |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
         }
 
+        if (ctxconfig->debug)
+            flags |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
+
         if (ctxconfig->robustness)
         {
             if (ctxconfig->robustness == GLFW_NO_RESET_NOTIFICATION)
diff --git a/src/glx_context.c b/src/glx_context.c
index 562abf7f..a13b51db 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -360,9 +360,6 @@ int _glfwCreateContext(_GLFWwindow* window,
             if (ctxconfig->forward)
                 flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 
-            if (ctxconfig->debug)
-                flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
-
             if (ctxconfig->profile)
             {
                 if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE)
@@ -374,6 +371,9 @@ int _glfwCreateContext(_GLFWwindow* window,
         else
             mask |= GLX_CONTEXT_ES2_PROFILE_BIT_EXT;
 
+        if (ctxconfig->debug)
+            flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
+
         if (ctxconfig->robustness)
         {
             if (_glfw.glx.ARB_create_context_robustness)
diff --git a/src/wgl_context.c b/src/wgl_context.c
index 7b3b9c90..57d05763 100644
--- a/src/wgl_context.c
+++ b/src/wgl_context.c
@@ -398,9 +398,6 @@ int _glfwCreateContext(_GLFWwindow* window,
             if (ctxconfig->forward)
                 flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
 
-            if (ctxconfig->debug)
-                flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
-
             if (ctxconfig->profile)
             {
                 if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE)
@@ -412,6 +409,9 @@ int _glfwCreateContext(_GLFWwindow* window,
         else
             mask |= WGL_CONTEXT_ES2_PROFILE_BIT_EXT;
 
+        if (ctxconfig->debug)
+            flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
+
         if (ctxconfig->robustness)
         {
             if (window->wgl.ARB_create_context_robustness)