diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java                                                                                                                   
index 31a8e489e..f6d37fb31 100644                                                                                                                                                                                                    
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java                                                                                                                                                                              
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java                                                                                                                                                                              
@@ -2133,7 +2133,7 @@ public abstract class GLContextImpl extends GLContext {                                                                                                                                                        
     final boolean isES = 0 != ( ctp & GLContext.CTX_PROFILE_ES );                                                                                                                                                                   
     final boolean isX11 = NativeWindowFactory.TYPE_X11 == NativeWindowFactory.getNativeWindowType(true);                                                                                                                            
     final boolean isWindows = Platform.getOSType() == Platform.OSType.WINDOWS;                                                                                                                                                      
-    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ");                                                                                                                                    
+    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ") || glVersion.contains(MesaSP);                                                                                                      
                                                                                                                                                                                                                                     
     final boolean isDriverATICatalyst;
     final boolean isDriverNVIDIAGeForce;
@@ -2347,8 +2347,10 @@ public abstract class GLContextImpl extends GLContext {
     if( isDriverMesa ) {
         final VersionNumber mesaSafeFBOVersion = new VersionNumber(8, 0, 0);
         final VersionNumber mesaIntelBuggySharedCtx921 = new VersionNumber(9, 2, 1);
+        final VersionNumber mesaSafeDoubleBufferedPBuffer = new VersionNumber(18, 2, 2);
+        final VersionNumber mesaSafeSetSwapIntervalPostRetarget = new VersionNumber(18, 2, 2);
 
-        {
+        if( vendorVersion.compareTo(mesaSafeSetSwapIntervalPostRetarget) < 0 ) {
             final int quirk = GLRendererQuirks.NoSetSwapIntervalPostRetarget;
             if(DEBUG) {
                 System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
@@ -2357,11 +2359,13 @@ public abstract class GLContextImpl extends GLContext {
         }
         if( hwAccel ) {
             // hardware-acceleration
-            final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
-            if(DEBUG) {
-                System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+            if( vendorVersion.compareTo(mesaSafeDoubleBufferedPBuffer) < 0 ) {
+                final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
+                if(DEBUG) {
+                    System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+                }
+                quirks.addQuirk( quirk );
             }
-            quirks.addQuirk( quirk );
         } else {
             // software
             if( vendorVersion.compareTo(mesaSafeFBOVersion) < 0 ) { // FIXME: Is it fixed in >= 8.0.0 ?