diff --git a/docs/changes.txt b/docs/changes.txt
index bf18d5f338..b6cfbbdc62 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -171,6 +171,7 @@ wxGTK:
 - Generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change.
 - Replaced g_free with g_border_free to fix crash with newer GTK+.
 - Fixed crash in settings when using tooltips->tip_window with GTK+ 2.11.6.
+- Fix WX_GL_STEREO attribute handling (Tristan Mehamli)
 
 wxMac:
 
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 7ac91509dc..d08235909e 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -464,6 +464,7 @@ void wxGLCanvas::GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList )
                     break;
                 case WX_GL_STEREO:
                     gl_attribList[p++] = GLX_STEREO;
+                    gl_attribList[p++] = 1;
                     break;
                 case WX_GL_AUX_BUFFERS:
                     gl_attribList[p++] = GLX_AUX_BUFFERS;
diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 235c0de0d7..e5396d0048 100644
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -548,6 +548,7 @@ void wxGLCanvas::GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList )
                     break;
                 case WX_GL_STEREO:
                     gl_attribList[p++] = GLX_STEREO;
+                    gl_attribList[p++] = 1;
                     break;
                 case WX_GL_AUX_BUFFERS:
                     gl_attribList[p++] = GLX_AUX_BUFFERS;
diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index c6aa213acc..41a5edc390 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -281,8 +281,8 @@ bool wxGLCanvas::Create( wxWindow *parent,
             data[p++]=GLX_BUFFER_SIZE; data[p++]=attribList[arg++]; break;
           case WX_GL_LEVEL:
             data[p++]=GLX_LEVEL; data[p++]=attribList[arg++]; break;
-          case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; break;
-          case WX_GL_STEREO: data[p++] = GLX_STEREO; break;
+          case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; data[p++] = 1; break;
+          case WX_GL_STEREO: data[p++] = GLX_STEREO; data[p++] = 1; break;
           case WX_GL_AUX_BUFFERS:
             data[p++]=GLX_AUX_BUFFERS; data[p++]=attribList[arg++]; break;
           case WX_GL_MIN_RED: