diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index 8ae0af69d..8a565c890 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar and b/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar b/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar
index d49079f8e..67b065ef5 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar and b/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar b/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar
index b2740f541..2c6fb702b 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar and b/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar b/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar
index f579929cc..73fef9804 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar and b/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index ec39e1f61..a8ea24f06 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar and b/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar
index ab46741b5..5a53fba96 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar and b/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar b/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar
index bc10b3985..cf6af53c3 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar and b/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar
index fd9187a80..8be2607e4 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar and b/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar b/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar
index d0a2b1d65..d9f263429 100644
Binary files a/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar and b/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar differ
diff --git a/engine/lib/jogl/gluegen-rt.jar b/engine/lib/jogl/gluegen-rt.jar
index 2c8708577..ee7287ae6 100644
Binary files a/engine/lib/jogl/gluegen-rt.jar and b/engine/lib/jogl/gluegen-rt.jar differ
diff --git a/engine/lib/jogl/joal-natives-linux-amd64.jar b/engine/lib/jogl/joal-natives-linux-amd64.jar
index a45ecf7d2..197336208 100644
Binary files a/engine/lib/jogl/joal-natives-linux-amd64.jar and b/engine/lib/jogl/joal-natives-linux-amd64.jar differ
diff --git a/engine/lib/jogl/joal-natives-linux-armv6.jar b/engine/lib/jogl/joal-natives-linux-armv6.jar
index a82a40a99..1f91d3f5e 100644
Binary files a/engine/lib/jogl/joal-natives-linux-armv6.jar and b/engine/lib/jogl/joal-natives-linux-armv6.jar differ
diff --git a/engine/lib/jogl/joal-natives-linux-armv6hf.jar b/engine/lib/jogl/joal-natives-linux-armv6hf.jar
index 0294d0344..e560f56e4 100644
Binary files a/engine/lib/jogl/joal-natives-linux-armv6hf.jar and b/engine/lib/jogl/joal-natives-linux-armv6hf.jar differ
diff --git a/engine/lib/jogl/joal-natives-linux-i586.jar b/engine/lib/jogl/joal-natives-linux-i586.jar
index 6142037f8..d4afe68c6 100644
Binary files a/engine/lib/jogl/joal-natives-linux-i586.jar and b/engine/lib/jogl/joal-natives-linux-i586.jar differ
diff --git a/engine/lib/jogl/joal-natives-macosx-universal.jar b/engine/lib/jogl/joal-natives-macosx-universal.jar
index a83717cb9..42dd96c89 100644
Binary files a/engine/lib/jogl/joal-natives-macosx-universal.jar and b/engine/lib/jogl/joal-natives-macosx-universal.jar differ
diff --git a/engine/lib/jogl/joal-natives-solaris-amd64.jar b/engine/lib/jogl/joal-natives-solaris-amd64.jar
index 2b034d213..bc5e78b60 100644
Binary files a/engine/lib/jogl/joal-natives-solaris-amd64.jar and b/engine/lib/jogl/joal-natives-solaris-amd64.jar differ
diff --git a/engine/lib/jogl/joal-natives-solaris-i586.jar b/engine/lib/jogl/joal-natives-solaris-i586.jar
index 789a83a21..93a41a022 100644
Binary files a/engine/lib/jogl/joal-natives-solaris-i586.jar and b/engine/lib/jogl/joal-natives-solaris-i586.jar differ
diff --git a/engine/lib/jogl/joal-natives-windows-amd64.jar b/engine/lib/jogl/joal-natives-windows-amd64.jar
index d3e99c90e..f1696059e 100644
Binary files a/engine/lib/jogl/joal-natives-windows-amd64.jar and b/engine/lib/jogl/joal-natives-windows-amd64.jar differ
diff --git a/engine/lib/jogl/joal-natives-windows-i586.jar b/engine/lib/jogl/joal-natives-windows-i586.jar
index 1def44e61..41f346111 100644
Binary files a/engine/lib/jogl/joal-natives-windows-i586.jar and b/engine/lib/jogl/joal-natives-windows-i586.jar differ
diff --git a/engine/lib/jogl/joal.jar b/engine/lib/jogl/joal.jar
index e0076f0ed..b4b67751d 100644
Binary files a/engine/lib/jogl/joal.jar and b/engine/lib/jogl/joal.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-linux-amd64.jar b/engine/lib/jogl/jogl-all-natives-linux-amd64.jar
index 2e3ba7dac..d6af8df86 100644
Binary files a/engine/lib/jogl/jogl-all-natives-linux-amd64.jar and b/engine/lib/jogl/jogl-all-natives-linux-amd64.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-linux-armv6.jar b/engine/lib/jogl/jogl-all-natives-linux-armv6.jar
index bac8aef19..d844783dc 100644
Binary files a/engine/lib/jogl/jogl-all-natives-linux-armv6.jar and b/engine/lib/jogl/jogl-all-natives-linux-armv6.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar b/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar
index 78d787eb0..c8fd76d9c 100644
Binary files a/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar and b/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-linux-i586.jar b/engine/lib/jogl/jogl-all-natives-linux-i586.jar
index 92340a5bb..92793bdcb 100644
Binary files a/engine/lib/jogl/jogl-all-natives-linux-i586.jar and b/engine/lib/jogl/jogl-all-natives-linux-i586.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-macosx-universal.jar b/engine/lib/jogl/jogl-all-natives-macosx-universal.jar
index 2c858dff0..ef9bbf52e 100644
Binary files a/engine/lib/jogl/jogl-all-natives-macosx-universal.jar and b/engine/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar b/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar
index ce87ac728..4b6bf6ae3 100644
Binary files a/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar and b/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-solaris-i586.jar b/engine/lib/jogl/jogl-all-natives-solaris-i586.jar
index c57c04ea4..ad6dd9ad5 100644
Binary files a/engine/lib/jogl/jogl-all-natives-solaris-i586.jar and b/engine/lib/jogl/jogl-all-natives-solaris-i586.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-windows-amd64.jar b/engine/lib/jogl/jogl-all-natives-windows-amd64.jar
index fc05e380d..76fbd3478 100644
Binary files a/engine/lib/jogl/jogl-all-natives-windows-amd64.jar and b/engine/lib/jogl/jogl-all-natives-windows-amd64.jar differ
diff --git a/engine/lib/jogl/jogl-all-natives-windows-i586.jar b/engine/lib/jogl/jogl-all-natives-windows-i586.jar
index d54815588..2314f1ea7 100644
Binary files a/engine/lib/jogl/jogl-all-natives-windows-i586.jar and b/engine/lib/jogl/jogl-all-natives-windows-i586.jar differ
diff --git a/engine/lib/jogl/jogl-all.jar b/engine/lib/jogl/jogl-all.jar
index 2ebd0ccf3..233f64f75 100644
Binary files a/engine/lib/jogl/jogl-all.jar and b/engine/lib/jogl/jogl-all.jar differ
diff --git a/engine/src/jogl/com/jme3/renderer/jogl/JoglGL1Renderer.java b/engine/src/jogl/com/jme3/renderer/jogl/JoglGL1Renderer.java
index 8cb23dbfa..18f25206a 100644
--- a/engine/src/jogl/com/jme3/renderer/jogl/JoglGL1Renderer.java
+++ b/engine/src/jogl/com/jme3/renderer/jogl/JoglGL1Renderer.java
@@ -1069,13 +1069,13 @@ public class JoglGL1Renderer implements GL1Renderer {
         GL gl = GLContext.getCurrentGL();
         switch (format) {
             case GL.GL_UNSIGNED_BYTE:
-                gl.glDrawElements(mode, data.limit(), format, (ByteBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (ByteBuffer) data);
                 break;
             case GL.GL_UNSIGNED_SHORT:
-                gl.glDrawElements(mode, data.limit(), format, (ShortBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (ShortBuffer) data);
                 break;
             case GL.GL_UNSIGNED_INT:
-                gl.glDrawElements(mode, data.limit(), format, (IntBuffer) data);
+                gl.getGL2().glDrawElements(mode, data.limit(), format, (IntBuffer) data);
                 break;
             default:
                 throw new UnsupportedOperationException();
diff --git a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
index 81dc2b47f..c512323f5 100644
--- a/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
+++ b/engine/src/jogl/com/jme3/renderer/jogl/JoglRenderer.java
@@ -2340,11 +2340,11 @@ public class JoglRenderer implements Renderer {
                 int elementLength = elementLengths[i];
 
                 if (useInstancing) {
-                    if (gl.isGL2GL3()) {
+                    if (gl.isGL2()) {
                         indexBuf.getData().position(curOffset);
                         indexBuf.getData().limit(curOffset + elementLength);
 
-                        gl.getGL2GL3().glDrawElementsInstanced(elMode,
+                        gl.getGL2().glDrawElementsInstanced(elMode,
                                 elementLength,
                                 fmt,
                                 indexBuf.getData(),
@@ -2363,7 +2363,7 @@ public class JoglRenderer implements Renderer {
                                 curOffset);
                     } else {
                         indexBuf.getData().position(curOffset);
-                        gl.glDrawElements(elMode, elementLength, fmt,
+                        gl.getGL2().glDrawElements(elMode, elementLength, fmt,
                                 indexBuf.getData());
                     }
                 }
@@ -2373,8 +2373,8 @@ public class JoglRenderer implements Renderer {
             }
         } else {
             if (useInstancing) {
-                if (gl.isGL2GL3()) {
-                    gl.getGL2GL3().glDrawElementsInstanced(convertElementMode(mesh.getMode()),
+                if (gl.isGL2()) {
+                    gl.getGL2().glDrawElementsInstanced(convertElementMode(mesh.getMode()),
                             indexBuf.getData().limit(),
                             convertFormat(indexBuf.getFormat()),
                             indexBuf.getData(),