diff --git a/CASA-auth-token/server-java/Svc/linux/envvars b/CASA-auth-token/server-java/Svc/linux/envvars
index f33dfe1e..58769221 100644
--- a/CASA-auth-token/server-java/Svc/linux/envvars
+++ b/CASA-auth-token/server-java/Svc/linux/envvars
@@ -7,15 +7,13 @@
 #                                                          #
 ############################################################
 
-# Set JAVA_HOME if not yet set
-if [ "$JAVA_HOME" == "" ]; then
-   if [ -d /usr/lib64 ]; then
-      LIB=lib64
-   else
-      LIB=lib
-   fi
-   JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
+# Set JAVA_HOME
+if [ -d /usr/lib64 ]; then
+   LIB=lib64
+else
+   LIB=lib
 fi
+JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
 
 CATALINA_BASE="/srv/www/casaats"
 CATALINA_HOME="/usr/share/tomcat5"
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
index b4cac795..5f53c5c7 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 24 10:55:40 MST 2007 - jluciani@novell.com
+
+- ATS envvars file now does not rely on the environment
+  variable JAVA_HOME since it may not be pointed to the
+  JVM that we would want to use. 
+
 -------------------------------------------------------------------
 Tue Jan 23 15:19:10 MST 2007 - jluciani@novell.com