diff --git a/CASA-auth-token/client/lib/linux/platform.c b/CASA-auth-token/client/lib/linux/platform.c
index e94addc3..fe8dbe00 100644
--- a/CASA-auth-token/client/lib/linux/platform.c
+++ b/CASA-auth-token/client/lib/linux/platform.c
@@ -392,7 +392,7 @@ CreateUserMutex(
 
    // We use Named Semaphores to provide this functionality. The semaphore names are
    // linked to the user via its uid.
-   if (sprintf(g_userNamedSemName, "/tmp/CASA/authtoken/client/semuser_%d", geteuid()) != -1)
+   if (sprintf(g_userNamedSemName, "/tmp/casa_auth_semuser_%d", geteuid()) != -1)
    {
       // Create or open semaphore to be only used by the effective user
       g_userNamedSem = Local_sem_open((const char*) g_userNamedSemName, O_RDWR | O_CREAT, 0600, 1);
diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
index d03cdf88..9f9f3fea 100644
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
+++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec  1 10:32:57 MST 2006 - jluciani@novell.com
+
+- Resolved BUG225118.
+
+- Made changes to issues found during self-code review. 
+
 -------------------------------------------------------------------
 Tue Nov 21 15:21:47 MST 2006 - schoi@novell.com
 
diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
index e9f99937..7c6da51b 100644
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
+++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.spec.in
@@ -112,10 +112,6 @@ install -d -m 755 %{buildroot}/etc/CASA
 install -d -m 755 %{buildroot}/etc/CASA/authtoken
 install -d -m 755 %{buildroot}/etc/CASA/authtoken/client
 install -d -m 755 %{buildroot}/etc/CASA/authtoken/client/mechanisms
-install -d %{buildroot}/tmp
-install -d -m 777 %{buildroot}/tmp/CASA
-install -d -m 777 %{buildroot}/tmp/CASA/authtoken
-install -d -m 777 %{buildroot}/tmp/CASA/authtoken/client
 
 
 ## CASA_auth_token_client ##
@@ -170,9 +166,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/CASA/authtoken
 %dir /etc/CASA/authtoken/client
 %dir /etc/CASA/authtoken/client/mechanisms
-%dir /tmp/CASA
-%dir /tmp/CASA/authtoken
-%dir /tmp/CASA/authtoken/client
 %{prefix}/%{_lib}/libcasa_c_authtoken.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so.%{bldno}
 %{prefix}/%{_lib}/CASA/authtoken/krb5mech.so