--- lib/DJabberd.pm.bak	2006-11-08 09:47:22.881036021 +0100
+++ lib/DJabberd.pm	2006-11-08 09:49:00.376847808 +0100
@@ -152,6 +152,7 @@
 
 sub set_config_pidfile {
     my ($self, $val) = @_;
+    $self->{pid_file} = $val;
     open(PIDFILE,'>',$val) or croak("Can't open pidfile $val for writing");
     print PIDFILE "$$\n";
     close(PIDFILE);
@@ -282,6 +283,7 @@
 
     DJabberd::Connection::Admin->on_startup;
     Danga::Socket->EventLoop();
+    unlink($self->{pid_file}) if $self->{pid_file};
 }
 
 sub _start_server {