diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 951e4e342..9bf070c39 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2997,7 +2997,9 @@ FW_dev2image($;$)
 
   my ($icon, $rlink);
   if(defined($devStateIcon) && $devStateIcon =~ m/^{.*}$/s) {
+    $cmdFromAnalyze = $devStateIcon; # help the __WARN__ sub
     my ($html, $link) = eval $devStateIcon;
+    $cmdFromAnalyze = undef;
     Log3 $FW_wname, 1, "devStateIcon $name: $@" if($@);
     return ($html, $link, 1) if(defined($html) && $html =~ m/^<.*>$/s);
     $devStateIcon = $html;
diff --git a/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz b/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz
index bbdb7f797..68e9ece9a 100644
Binary files a/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz and b/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz differ
diff --git a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
index 2395ec852..b90826abc 100644
--- a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
+++ b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
@@ -202,6 +202,12 @@
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0002"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0102"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0202"/>
+    <Product config="aeotec/zwa011.xml" id="000b" name="ZWA011 Door/Windows Sensor 7" type="0002"/>
+    <Product config="aeotec/zwa011.xml" id="000b" name="ZWA011 Door/Windows Sensor 7" type="0102"/>
+    <Product config="aeotec/zwa011.xml" id="000b" name="ZWA011 Door/Windows Sensor 7" type="0202"/>
+    <Product config="aeotec/zwa011.xml" id="0029" name="ZWA011 Door/Windows Sensor 7" type="0002"/>
+    <Product config="aeotec/zwa011.xml" id="0029" name="ZWA011 Door/Windows Sensor 7" type="0102"/>
+    <Product config="aeotec/zwa011.xml" id="0029" name="ZWA011 Door/Windows Sensor 7" type="0202"/>
     <Product config="aeotec/zwa021.xml" id="0015" name="ZWA021 Thermostatic Valve" type="0002"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0003"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0103"/>