--- gridengine/source/daemons/qmaster/sge_thread_jvm.c.jni	2008-07-10 10:05:22.000000000 -0600
+++ gridengine/source/daemons/qmaster/sge_thread_jvm.c	2008-11-04 15:14:53.000000000 -0700
@@ -766,11 +766,17 @@
    jvm_argv[2] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.caTop=%s", ctx->get_ca_root(ctx)));
    jvm_argv[3] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.serverKeystore=%s", keystore_path));
    jvm_argv[4] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.sgeQmasterSpoolDir=%s", ctx->get_qmaster_spool_dir(ctx)));
-   jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=%s/lib/jgdi.jar:%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
+   char *libdir;
+   if (strstr(sge_get_arch(),"64") != NULL) {
+      libdir = "lib64";
+   } else {
+      libdir = "lib";
+   }
+   jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=/usr/%s/gridengine/jgdi.jar:/usr/%s/gridengine/juti.jar", libdir, libdir));
    jvm_argv[6] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.policy=%s/common/jmx/java.policy", ctx->get_cell_root(ctx)));
    jvm_argv[7] = strdup("-Djava.security.manager=com.sun.grid.jgdi.management.JGDISecurityManager");
-   jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file://%s/lib/jgdi.jar file://%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
-   jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=%s/lib/%s", ctx->get_sge_root(ctx), sge_get_arch()));
+   jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file:///usr/%s/gridengine/jgdi.jar file:///usr/%s/gridengine/juti.jar", libdir, libdir));
+   jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=/usr/%s/gridengine", libdir));
    jvm_argv[10] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.access.file=%s/common/jmx/jmxremote.access", ctx->get_cell_root(ctx)));
    jvm_argv[11] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.password.file=%s/common/jmx/jmxremote.password", ctx->get_cell_root(ctx)));
    jvm_argv[12] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.auth.login.config=%s/common/jmx/jaas.config", ctx->get_cell_root(ctx)));
--- gridengine/source/libs/jgdi/util/java.policy.template.jni	2008-02-13 07:35:11.000000000 -0700
+++ gridengine/source/libs/jgdi/util/java.policy.template	2008-11-06 09:32:31.000000000 -0700
@@ -39,7 +39,7 @@
 ** grant principal javax.management.remote.JMXPrincipal "controlRole"
 **
 */
-grant codeBase "file:${com.sun.grid.jgdi.sgeRoot}/lib/jgdi.jar"  {
+grant codeBase "file:${java.library.path}/jgdi.jar"  {
    permission java.net.SocketPermission   "*:1024-", "accept,connect";
    permission java.net.SocketPermission   "localhost:1024-", "listen,resolve";
    permission java.lang.RuntimePermission "loadLibrary.jgdi";