2 files changed, 6 insertions, 5 deletions

diff --git a/build.xml b/build.xml
index 1fc62e2f..4580f106 100644
--- a/build.xml
+++ b/build.xml
@@ -85,12 +85,13 @@
 
     <target name="-post-jar" depends="jar.natives,tag.build">
 
-        <!-- TODO temporary codebase -->
-        <property name="jnlp.codebase" value="http://people.fh-landshut.de/~mbien/jogamp/jocl/"/>
+        <property name="jocl.jnlp.codebase"     value="http://jogamp.org/deployment/webstart-next/jocl"/>
+        <property name="gluegen.jnlp.codebase"  value="http://jogamp.org/deployment/jocl-webstart-next"/>
 
         <copy file="jocl.jnlp" tofile="${dist.jar.dir}/jocl.jnlp">
             <filterchain>
-                <replacestring from="CODEBASE_TAG" to="${jnlp.codebase}"/>
+                <replacestring from="JOCL_CODEBASE_TAG"     to="${jocl.jnlp.codebase}"/>
+                <replacestring from="GLUEGEN_CODEBASE_TAG"  to="${gluegen.jnlp.codebase}"/>
             </filterchain>
         </copy>
 
diff --git a/jocl.jnlp b/jocl.jnlp
index c243ca20..2450b2b3 100644
--- a/jocl.jnlp
+++ b/jocl.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="CODEBASE_TAG" href="jocl.jnlp">
+<jnlp codebase="JOCL_CODEBASE_TAG" href="jocl.jnlp">
     <information>
         <title>Java(tm) Binding to the OpenCL(r) API</title>
         <vendor>JogAmp Community</vendor>
@@ -14,7 +14,7 @@
     </security>
     <resources>
         <jar href="jocl.jar" />
-        <extension name="gluegen-rt" href="http://jogamp.org/deployment/webstart-next/gluegen-rt.jnlp" />
+        <extension name="gluegen-rt" href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
     <resources os="Windows" arch="x86">
         <nativelib href = "jocl-natives-windows-i586.jar" />