diff --git a/CHANGED b/CHANGED
index 346a6f0dd..6cdf1d784 100644
--- a/CHANGED
+++ b/CHANGED
@@ -10,7 +10,7 @@
   - bugfix:  FHEM2FHEM should work with CUL again, after syntax change
   - feature: CUL directio mode (No Device::SerialPort needed)
   - feature: FritzBox 7270 ZIP file
-  - buxgfix: prevent fhem from stalling if telnet times out in 66_ECMD.pm
+  - bugfix:  prevent fhem from stalling if telnet times out in 66_ECMD.pm
   - feature: added postproc ability to classdef in 66_ECMD.pm (Boris, Heinz)
   - feature: FHEMWEB longpoll mode, small fixes, tuned smallscreen mode
   - feature: average module added
@@ -27,6 +27,7 @@
   - feature: FHEMWEB save button, smallscreen first screen fix
   - feature: FHEMWEB encoding is now UTF-8, alias attribute is respected
   - change:  HTTPS certs directory moved from cwd into modpath
+  - feature: shutdwown parameter restart added
 
   
 - 2011-07-08 (5.1)
diff --git a/TODO b/TODO
index 3e4e83b1c..eeb1734a6 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,12 @@
 FHEM:
-- uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot)
+- FHEM2FHEM reconnect
 - HomeMatic set log 2
-- mergelog
 
 - autodetect physical hardware
 - RFR: Error message for uncomplete last message
 - implement wiki decisions
 
 Webpgm2
-- setting the dummy state via dropdown is not possible
 - click on the graph only correct for the day zoom
 - integrate weblink details in the SVG
 - autocreate: multiple plots
diff --git a/docs/commandref.html b/docs/commandref.html
index 77b5bca04..de75c9bac 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -962,14 +962,16 @@ A line ending with \ will be concatenated with the next one, so long lines
 <a name="shutdown"></a>
 <h3>shutdown</h3>
 <ul>
-  <code>shutdown</code>
+  <code>shutdown [restart]</code>
   <br><br>
   Shut down the server (after saving the <a href="#statefile">state information
-  </a>). It triggers the global:SHUTDOWN event.
+  </a>). It triggers the global:SHUTDOWN event.  If the optional restart
+  parameter is specified, fhem tries to restart itself.
   <br><br>
   Example:
   <ul>
-    <code>shutdown</code>
+    <code>shutdown</code><br>
+    <code>shutdown restart</code>
   </ul>
 </ul>
 
diff --git a/fhem.pl b/fhem.pl
index a3d2c4984..b1ea080de 100755
--- a/fhem.pl
+++ b/fhem.pl
@@ -233,7 +233,7 @@ my $commonAttr = "eventMap";
   "setdefaultattr" => { Fn=>"CommandDefaultAttr",
 	    Hlp=>"<attrname> <attrvalue>,set attr for following definitions" },
   "shutdown"=> { Fn=>"CommandShutdown",
-	    Hlp=>",terminate the server" },
+	    Hlp=>"[restart],terminate the server" },
   "sleep"  => { Fn=>"CommandSleep",
             Hlp=>"<sec>,sleep for sec, 3 decimal places" },
   "trigger" => { Fn=>"CommandTrigger",
@@ -1042,6 +1042,9 @@ CommandShutdown($$)
 
   WriteStatefile();
   unlink($attr{global}{pidfilename}) if($attr{global}{pidfilename});
+  if($param && $param eq "restart") {
+    system("(sleep 2; exec perl $0 $attr{global}{configfile})&");
+  }
   exit(0);
 }