diff --git a/fhem/CHANGED b/fhem/CHANGED
index e9e27504d..13f5a5a67 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -301,3 +301,6 @@
   - feature: renamed fhz1000 to fhem
   - feature: added HISTORY and README.DEV
   - doc:     Added description of attribute "model".
+  - bugfix:  delete the pidfile when terminating. (reported by Martin and Peter)
+  - TODO: feature: add direction to the logs
+  - TODO: bugfix: more thorough serial line initialization
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 1da13ee22..79ab9b64b 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -713,6 +713,7 @@ CommandShutdown($$)
   my ($cl, $param) = @_;
   Log 0, "Server shutdown";
   DoSavefile();
+  unlink($pidfilename) if($pidfilename);
   exit(0);
 }