diff --git a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
index bc7dbb26..d7b96a1c 100755
--- a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
+++ b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
@@ -91,9 +91,9 @@ function java_1_5_oes_workaround
    fi
 
    # Now import the cert into java's keystore
-   $JAVA_HOME/bin/keytool -import\
+   $JAVA_HOME/bin/keytool -import -noprompt\
       -trustcacerts\
-      -alias edit_root_ca\
+      -alias edir_root_ca\
       -keystore $JAVA_KEY_STORE_PATH\
       -storepass changeit\
       -file $CERT_FILE_PATH
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 56b9d6a3..730998e0 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,11 @@
+-------------------------------------------------------------------
+Wed Dec  6 10:29:15 MST 2006 - jluciani@novell.com
+
+- Added option to the command being used to import
+  certificate from the CasaBasicATSSetup script so
+  that it works correctly in conjunction with our
+  Yast module. This addresses BUG225428. 
+
 -------------------------------------------------------------------
 Mon Dec  4 17:21:00 MST 2006 - jluciani@novell.com