diff --git a/examples/nbody/build.xml b/examples/nbody/build.xml
index e50f7cd569dea65c4d114f7bb271cd98a6860360..0ae46630c1289a59a44774ae6790e963b942961d 100644
--- a/examples/nbody/build.xml
+++ b/examples/nbody/build.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 
 <project name="nbody" default="build" basedir=".">
-   <property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_28-joal_17-jogl_41-jocl_25/jar"/>
+   <!--<property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_28-joal_17-jogl_41-jocl_25/jar"/>-->
+   <property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_52-joal_32-jogl_66-jocl_41/jar"/>
 
    <path id="compiler.class.path">
       <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
-      <pathelement path="jogamp/jogl.all.jar"/>
+      <pathelement path="jogamp/jogl-all.jar"/>
       <pathelement path="jogamp/gluegen-rt.jar"/>
    </path>
 
@@ -19,7 +20,7 @@
       <get dest="jogamp">
          <url url="${jogamp-jar-url}/jogl-all-natives-windows-i586.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-i586.jar"/> 
-         <url url="${jogamp-jar-url}/jogl.all.jar"/> 
+         <url url="${jogamp-jar-url}/jogl-all.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt.jar"/> 
       </get>
       <unzip src="jogamp/jogl-all-natives-windows-i586.jar" dest="jogamp"/>
@@ -32,7 +33,7 @@
       <get dest="jogamp">
          <url url="${jogamp-jar-url}/jogl-all-natives-windows-amd64.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-amd64.jar"/> 
-         <url url="${jogamp-jar-url}/jogl.all.jar"/> 
+         <url url="${jogamp-jar-url}/jogl-all.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt.jar"/> 
       </get>
       <unzip src="jogamp/jogl-all-natives-windows-amd64.jar" dest="jogamp"/>
@@ -45,7 +46,7 @@
       <get dest="jogamp">
          <url url="${jogamp-jar-url}/jogl-all-natives-linux-i586.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-i586.jar"/> 
-         <url url="${jogamp-jar-url}/jogl.all.jar"/> 
+         <url url="${jogamp-jar-url}/jogl-all.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt.jar"/> 
       </get>
       <unzip src="jogamp/jogl-all-natives-linux-i586.jar" dest="jogamp"/>
@@ -58,7 +59,7 @@
       <get dest="jogamp">
          <url url="${jogamp-jar-url}/jogl-all-natives-linux-amd64.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-amd64.jar"/> 
-         <url url="${jogamp-jar-url}/jogl.all.jar"/> 
+         <url url="${jogamp-jar-url}/jogl-all.jar"/> 
          <url url="${jogamp-jar-url}/gluegen-rt.jar"/> 
       </get>
       <unzip src="jogamp/jogl-all-natives-linux-amd64.jar" dest="jogamp"/>
@@ -71,7 +72,7 @@
 	  <get dest="jogamp">
 	     <url url="${jogamp-jar-url}/jogl-all-natives-macosx-universal.jar"/> 
 	     <url url="${jogamp-jar-url}/gluegen-rt-natives-macosx-universal.jar"/> 
-	     <url url="${jogamp-jar-url}/jogl.all.jar"/> 
+	     <url url="${jogamp-jar-url}/jogl-all.jar"/> 
 	     <url url="${jogamp-jar-url}/gluegen-rt.jar"/> 
 	  </get>
 	  <unzip src="jogamp/jogl-all-natives-macosx-universal.jar" dest="jogamp"/>
@@ -89,7 +90,7 @@
             </or>
             <not><available file="jogamp/jogl-all-natives-windows-i586.jar"/> </not>
             <not><available file="jogamp/gluegen-rt-natives-windows-i586.jar"/> </not>
-            <not><available file="jogamp/jogl.all.jar"/> </not>
+            <not><available file="jogamp/jogl-all.jar"/> </not>
             <not><available file="jogamp/gluegen-rt.jar"/> </not>
          </and>
       </condition>
@@ -104,7 +105,7 @@
             </not>
             <not><available file="jogamp/jogl-all-natives-windows-amd64.jar"/> </not>
             <not><available file="jogamp/gluegen-rt-natives-windows-amd64.jar"/> </not>
-            <not><available file="jogamp/jogl.all.jar"/> </not>
+            <not><available file="jogamp/jogl-all.jar"/> </not>
             <not><available file="jogamp/gluegen-rt.jar"/> </not>
          </and>
       </condition>
@@ -120,7 +121,7 @@
             </or>
             <not><available file="jogamp/jogl-all-natives-linux-i586.jar"/> </not>
             <not><available file="jogamp/gluegen-rt-natives-linux-i586.jar"/> </not>
-            <not><available file="jogamp/jogl.all.jar"/> </not>
+            <not><available file="jogamp/jogl-all.jar"/> </not>
             <not><available file="jogamp/gluegen-rt.jar"/> </not>
          </and>
       </condition>
@@ -138,7 +139,7 @@
             </not>
             <not><available file="jogamp/jogl-all-natives-linux-amd64.jar"/> </not>
             <not><available file="jogamp/gluegen-rt-natives-linux-amd64.jar"/> </not>
-            <not><available file="jogamp/jogl.all.jar"/> </not>
+            <not><available file="jogamp/jogl-all.jar"/> </not>
             <not><available file="jogamp/gluegen-rt.jar"/> </not>
          </and>
       </condition>
@@ -153,7 +154,7 @@
    	        </not>
    	        <not><available file="jogamp/jogl-all-natives-macosx-universal.jar"/> </not>
    	        <not><available file="jogamp/gluegen-rt-natives-macosx-universal.jar"/> </not>
-   	        <not><available file="jogamp/jogl.all.jar"/> </not>
+   	        <not><available file="jogamp/jogl-all.jar"/> </not>
    	        <not><available file="jogamp/gluegen-rt.jar"/> </not>
    	     </and>
    	  </condition>
diff --git a/examples/nbody/nbody.bat b/examples/nbody/nbody.bat
index 967350bc2922a2a90d9dae8c3b5692b6ce1b5600..9c5cca7492f0610db429bc536ee98ae6b2ef15c3 100644
--- a/examples/nbody/nbody.bat
+++ b/examples/nbody/nbody.bat
@@ -8,7 +8,7 @@ java ^
   -Dbodies=%2 ^
   -Dheight=600 ^
   -Dwidth=600 ^
-  -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
+  -classpath jogamp\gluegen-rt.jar;jogamp\jogl-all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
   com.amd.aparapi.examples.nbody.Main 
 
 
diff --git a/examples/nbody/nbody.sh b/examples/nbody/nbody.sh
index 5e3ada39a153513c50ff2e1f48a324094a08847e..53131f1c5cf3f3e2afefde23f47291e37576b9bb 100644
--- a/examples/nbody/nbody.sh
+++ b/examples/nbody/nbody.sh
@@ -5,6 +5,6 @@ java \
   -Dbodies=$1 \
   -Dheight=600 \
   -Dwidth=600 \
-  -classpath jogamp/jogl.all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:nbody.jar \
+  -classpath jogamp/jogl-all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:nbody.jar \
   com.amd.aparapi.examples.nbody.Main