diff --git a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh
index 0a20c2e4..3b1239ec 100755
--- a/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh
+++ b/CASA-auth-token/server-java/Jaas/linux/client_keystore_setup.sh
@@ -34,7 +34,13 @@
 #                                                           #
 #############################################################
 
-JAVA_HOME=/usr/lib/jvm/jre-1.5.0
+if [ -d /usr/lib64 ]; then
+  LIB=lib64
+else
+  LIB=lib
+fi
+
+JAVA_HOME=/usr/$LIB/jvm/jre-1.5.0
 
 # Do not do anything if the client keystore has already been created
 if [ -f /etc/CASA/authtoken/keys/client/jks-store ]; then
diff --git a/CASA-auth-token/server-java/Svc/linux/envvars b/CASA-auth-token/server-java/Svc/linux/envvars
index f670ed5a..2a5f9bb7 100644
--- a/CASA-auth-token/server-java/Svc/linux/envvars
+++ b/CASA-auth-token/server-java/Svc/linux/envvars
@@ -6,9 +6,15 @@
 # when starting the service.                               #
 #                                                          #
 ############################################################
+if [ -d /usr/lib64 ]; then
+  LIB=lib64
+else
+  LIB=lib
+fi
+
 CATALINA_BASE="/srv/www/casaats"
 CATALINA_HOME="/usr/share/tomcat5"
-JAVA_HOME="/usr/lib/jvm/jre-1.5.0"
+JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
 JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc"
 export CATALINA_BASE CATALINA_HOME JAVA_HOME JAVA_OPTS
 
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
index 6170149d..0f146854 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
@@ -29,7 +29,7 @@ Release:       0
 Summary:       Novell Common Authentication Services Adapter Authentication Token Infrastructure "Java" (CASA_auth_token)
 Source:        %{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-Requires:      java-1_5_0 >= 1.5.0
+Requires:      java >= 1.5.0
 Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed
 PreReq:        %fillup_prereq %insserv_prereq
 PreReq:        /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
@@ -55,7 +55,7 @@ enabled.
 %package -n CASA_auth_token_jaas_support
 Summary:      Libraries needed for JAAS applications development.
 Group:        Applications/System
-Requires:     java-1_5_0 >= 1.5.0
+Requires:     java >= 1.5.0
 
 %description -n CASA_auth_token_jaas_support
 CASA_auth_token is an authentication token infrastructure with support for multiple
diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
index f510ca63..b5d51d77 100644
--- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
+++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
@@ -26,7 +26,7 @@ Release:        1
 Summary:        Novell CASA Authentication Token Libraries for C/C++ Server Applications
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       java-1_5_0 >= 1.5.0
+Requires:       java >= 1.5.0
 Requires:       expat binutils CASA_auth_token_jaas_support sysvinit insserv
 PreReq:         %fillup_prereq %insserv_prereq
 PreReq:		/usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd