--- usr/include/pkcs11/slotmgr.h
+++ usr/include/pkcs11/slotmgr.h
@@ -325,7 +325,7 @@
 #endif
 
 
-#define PID_FILE_PATH CONFIG_PATH "/.slotpid"
+#define PID_FILE_PATH "/var/run/pkcsslotd.pid"
 
 #ifndef CK_BOOL
     #define CK_BOOL  CK_BBOOL
--- usr/sbin/pkcsslotd/slotmgr.c
+++ usr/sbin/pkcsslotd/slotmgr.c
@@ -314,6 +314,10 @@
 
 void DumpSharedMemory ( void );
 
+void unlink_pidfile(void)
+{
+  unlink(PID_FILE_PATH);
+}
 
 /*****************************************
  *  main() -
@@ -575,6 +579,7 @@
            fprintf(pidfile,"%d",getpid());
 	   fclose(pidfile);
         }
+        atexit(unlink_pidfile);
      }
 
    #pragma info(none)