diff --git a/core/.classpath b/core/.classpath
index c4cc74f89..48d0ca6fc 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -26,12 +26,12 @@
 	<classpathentry kind="lib" path="lib-test/uispec4j-2.3-jdk16.jar"/>
 	<classpathentry kind="lib" path="resources"/>
 	<classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
-	<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
-	<classpathentry kind="lib" path="lib/jogl/jogl.all.jar"/>
 	<classpathentry kind="lib" path="lib/OrangeExtensions-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/guice-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/guice-multibindings-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/javax.inject.jar"/>
 	<classpathentry kind="lib" path="lib/aopalliance.jar"/>
+	<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
+	<classpathentry kind="lib" path="lib/jogl/jogl-all.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/build.xml b/core/build.xml
index ba9e25a8c..464ce484b 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -80,7 +80,7 @@
 			<manifest>
 				<attribute name="Main-Class" value="${main-class}" />
 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png" />
-				<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl.all.jar" />
+				<attribute name="Classpath-Jars" value="lib/gluegen-rt.jar lib/jogl-all.jar" />
 			</manifest>
 
 			<!-- Include, in the root of the JAR, the resources needed by OR -->
diff --git a/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index ee7cf4be9..851477ae9 100644
Binary files a/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar and b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-linux-i586.jar b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar
index a7a700783..d45803dcd 100644
Binary files a/core/lib/jogl/gluegen-rt-natives-linux-i586.jar and b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index 72d86d37d..de6a15970 100644
Binary files a/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar and b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar
index 19f62cb93..aeb51ecd7 100644
Binary files a/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar and b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/core/lib/jogl/gluegen-rt-natives-windows-i586.jar b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar
index 713ce14c1..ffaedb49c 100644
Binary files a/core/lib/jogl/gluegen-rt-natives-windows-i586.jar and b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar differ
diff --git a/core/lib/jogl/gluegen-rt.jar b/core/lib/jogl/gluegen-rt.jar
index 07bcb06ee..15ad94def 100644
Binary files a/core/lib/jogl/gluegen-rt.jar and b/core/lib/jogl/gluegen-rt.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-linux-amd64.jar b/core/lib/jogl/jogl-all-natives-linux-amd64.jar
index 544b7d7e0..726eb1320 100644
Binary files a/core/lib/jogl/jogl-all-natives-linux-amd64.jar and b/core/lib/jogl/jogl-all-natives-linux-amd64.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-linux-i586.jar b/core/lib/jogl/jogl-all-natives-linux-i586.jar
index 75165df31..cfbffdda8 100644
Binary files a/core/lib/jogl/jogl-all-natives-linux-i586.jar and b/core/lib/jogl/jogl-all-natives-linux-i586.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-macosx-universal.jar b/core/lib/jogl/jogl-all-natives-macosx-universal.jar
index 347583871..b23abf431 100644
Binary files a/core/lib/jogl/jogl-all-natives-macosx-universal.jar and b/core/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-windows-amd64.jar b/core/lib/jogl/jogl-all-natives-windows-amd64.jar
index 9dbe67cd4..b8ab7277b 100644
Binary files a/core/lib/jogl/jogl-all-natives-windows-amd64.jar and b/core/lib/jogl/jogl-all-natives-windows-amd64.jar differ
diff --git a/core/lib/jogl/jogl-all-natives-windows-i586.jar b/core/lib/jogl/jogl-all-natives-windows-i586.jar
index 0b03ce7c2..3e0685737 100644
Binary files a/core/lib/jogl/jogl-all-natives-windows-i586.jar and b/core/lib/jogl/jogl-all-natives-windows-i586.jar differ
diff --git a/core/lib/jogl/jogl.all.jar b/core/lib/jogl/jogl-all.jar
similarity index 52%
rename from core/lib/jogl/jogl.all.jar
rename to core/lib/jogl/jogl-all.jar
index 34e9aa7d3..91cf32d1e 100644
Binary files a/core/lib/jogl/jogl.all.jar and b/core/lib/jogl/jogl-all.jar differ