diff --git a/fhem/CHANGED b/fhem/CHANGED
index 8f2c3888b..d30dfd4b4 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,7 @@
 # Add changes at the top of the list.
 
 - SVN
+  - feature: updatefhem will be silently converted to update
   - feature: FHEMWEB: save button replaced with the menu entry "Save config"
   - feature: notify supports $NAME/$EVENT/$EVTPART0/etc. @/% is deprecated.
   - feature: 93_DbLog extended to give more functions for the charting frontend.
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 4b0e97525..eb9cfb69d 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -269,6 +269,9 @@ $readingFnAttributes = "event-on-change-reading event-on-update-reading ".
             Hlp=>"<sec>,sleep for sec, 3 decimal places" },
   "trigger" => { Fn=>"CommandTrigger",
             Hlp=>"<devspec> <state>,trigger notify command" },
+  "update" => {
+            Hlp => "[development|stable] [<file>|check|fhem],update Fhem" },
+  "updatefhem" => { ReplacedBy => "update" },
 );
 
 ###################################################
@@ -756,9 +759,11 @@ AnalyzeCommand($$)
     }
   }
 
+  $fn = $cmds{$fn}{ReplacedBy} if(defined($cmds{$fn}{ReplacedBy}));
+
   #############
   # autoload commands.
-  if(!defined($cmds{$fn})) {
+  if(!defined($cmds{$fn}) || !defined($cmds{$fn}{Fn})) {
     map { $fn = $_ if(lc($fn) eq lc($_)); } keys %modules;
     $fn = LoadModule($fn);
     return "Unknown command $fn, try help" if(!defined($cmds{$fn}));
@@ -848,6 +853,7 @@ CommandHelp($$)
 	    "-----------------------------------------------\n";
 
   for my $cmd (sort keys %cmds) {
+    next if(!$cmds{$cmd}{Hlp});
     my @a = split(",", $cmds{$cmd}{Hlp}, 2);
 
     $str .= sprintf("%-9s %-25s %s\n", $cmd, $a[0], $a[1]);