--- cogl-1.12.2/cogl/winsys/cogl-winsys-glx.c	2013-01-04 09:16:12.000000000 -0500
+++ cogl-1.12.2/cogl/winsys/cogl-winsys-glx.c	2013-05-22 21:23:44.304838235 -0400
@@ -522,10 +522,10 @@ 
   if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4 &&
       config->samples_per_pixel)
     {
-       attributes[i++] = GLX_SAMPLE_BUFFERS;
-       attributes[i++] = 1;
-       attributes[i++] = GLX_SAMPLES;
-       attributes[i++] = config->samples_per_pixel;
+      attributes[i++] = GLX_SAMPLE_BUFFERS;
+      attributes[i++] = 1;
+      attributes[i++] = GLX_SAMPLES;
+      attributes[i++] = config->samples_per_pixel;
     }
 
   attributes[i++] = None;
@@ -1564,6 +1564,16 @@ 
       if (value != depth && (value - alpha) != depth)
         continue;
 
+      if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
+        {
+          glx_renderer->glXGetFBConfigAttrib (dpy,
+                                              fbconfigs[i],
+                                              GLX_SAMPLES,
+                                              &value);
+          if (value > 1)
+            continue;
+        }
+
       value = 0;
       if (depth == 32)
         {