diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
index 2fd2f8a5..799407bb 100644
--- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
+++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
@@ -19,7 +19,7 @@
 # X-UnitedLinux-Should-Start: $syslog $time
 # Required-Stop: $local_fs $remote_fs
 # X-UnitedLinux-Should-Stop: $syslog $time
-# Default-Start: 1 2 3 5
+# Default-Start: 2 3 5
 # Default-Stop:
 # Short-Description: Casa Authtoken Validate Daemon
 # Description: Start Casa Authtoken Validate Daemon
@@ -87,6 +87,9 @@ StartDAEMON()
   fi
   
   ulimit -f unlimited
+
+  # Make sure that the client keystore has been setup
+  /usr/share/java/CASA/authtoken/bin/client_keystore_setup.sh -s
   
   # Start the daemon
   echo -n "Starting casa_atvd..."
diff --git a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
index d3338975..259cab8f 100644
--- a/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
+++ b/CASA-auth-token/server/package/linux/CASA_auth_token_server.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jan  3 14:58:51 MST 2007 - jluciani@novell.com
+
+- Fixed casa_atvd not starting by default problem documented
+  in BUG228036.
+
+- Fixed problem that was causing token validation to fail because
+  the signing certificate had not been imported to the key store
+  used for token validations. The issue would be seen whenever
+  the CASA_auth_token_jaas_support rpm was installed before running
+  the basic ATS setup script. Now, the casa_atvd init.d scrip executes
+  the script used to import the certificate as part of its daemon start
+  sequence.
+
 -------------------------------------------------------------------
 Fri Dec  8 15:20:11 MST 2006 - jluciani@novell.com
 
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 b5d51d77..f4f0d093 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
@@ -251,7 +251,7 @@ fi
 /sbin/ldconfig
 
 # Install casa_atvd init script, set it to start by default.
-%{fillup_and_insserv casa_atvd}
+%{fillup_and_insserv -y casa_atvd}
 
 
 %preun