 +}
 +
 +- (void) _handleTermination:(NSNumber *)_signal {
-+  if (!terminationSignal)
++  if (!terminationSignal) {
 +    ASSIGN (terminationSignal, _signal);
++    if (pidFile)
++      unlink (pidFile);
++  }
 +}
 +
 +- (void) _handleSIGHUP:(NSNumber *)_signal {

 @end
 
 int WOWatchDogApplicationMainWithServerDefaults
@@ -437,7 +1039,7 @@
   {
     extern char **environ;
     [NSProcessInfo initializeWithArguments:(void*)argv count:argc

 }
 #endif
 
@@ -421,8 +1030,8 @@
 
 @interface NSUserDefaults(ServerDefaults)
 + (id)hackInServerDefaults:(NSUserDefaults *)_ud
