diff --git a/FHEM/10_ZWave.pm b/FHEM/10_ZWave.pm
index a948cfbd3..02b2f8c49 100644
--- a/FHEM/10_ZWave.pm
+++ b/FHEM/10_ZWave.pm
@@ -711,6 +711,7 @@ ZWave_Initialize($)
   $hash->{UndefFn}   = "ZWave_Undef";
   $hash->{AttrFn}    = "ZWave_Attr";
   $hash->{ParseFn}   = "ZWave_Parse";
+  $hash->{RenameFn}  = "ZWave_Rename";
   no warnings 'qw';
   my @attrList = qw(
     IODev
@@ -5024,6 +5025,13 @@ ZWave_Parse($$@)
   return $name;
 }
 
+#####################################
+sub
+ZWave_Rename($$)
+{
+  my ($old, $new) = @_;
+  ZWave_setEndpoints($defs{$new});
+}
 
 #####################################
 sub