diff --git a/CASA-auth-token/server-java/Svc/linux/envvars b/CASA-auth-token/server-java/Svc/linux/envvars
index 863044ed..84e8ca53 100644
--- a/CASA-auth-token/server-java/Svc/linux/envvars
+++ b/CASA-auth-token/server-java/Svc/linux/envvars
@@ -13,10 +13,17 @@ if [ -d /usr/lib64 ]; then
 else
    LIB=lib
 fi
+
 JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
 
 CATALINA_BASE="/srv/www/casaats"
-CATALINA_HOME="/usr/share/tomcat5"
+
+if [ -d /usr/share/tomcat55 ]; then
+   CATALINA_HOME="/usr/share/tomcat55"
+else
+   CATALINA_HOME="/usr/share/tomcat5"
+fi
+
 CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
 JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc -Dlog4j.configuration=file:/etc/CASA/authtoken/svc/log4j.properties -Djava.library.path=/usr/$LIB"
 export CATALINA_BASE CATALINA_HOME CATALINA_PID JAVA_HOME JAVA_OPTS
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 ac92722c..ec9f7417 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 @@
+-------------------------------------------------------------------
+Thu Aug  9 10:19:43 MDT 2007 - jluciani@novell.com
+
+- Changed tomcat5 dependency to tomcat55 for SuSE versions
+  greater or equal to 1030 to handle changes in the distribution.
+  This addresses BUG 297712. 
+
 -------------------------------------------------------------------
 Fri Jun 29 09:28:40 MDT 2007 - jluciani@novell.com
 
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 382db6cb..0cc8cdb3 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
@@ -19,6 +19,11 @@ Name:          @PACKAGE@
 URL:           http://www.novell.com/products
 BuildRequires:  gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis
 BuildRequires:  java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel curl
+%if %suse_version < 1030
+BuildRequires: tomcat5
+%else
+BuildRequires: tomcat55
+%endif
 %define prefix /usr
 License:       LGPL
 Group:         Applications/System
@@ -30,7 +35,12 @@ Summary:       Novell CASA Authentication Token Service
 Source:        %{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Requires:      jre >= 1.5.0
-Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl
+Requires:      servletapi5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl
+%if %suse_version < 1030
+Requires: tomcat5
+%else
+Requires: tomcat55
+%endif
 PreReq:        %fillup_prereq %insserv_prereq
 PreReq:        /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
 PreReq:        /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent