diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 2bdc37de4..ccdb79d4c 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -1098,7 +1098,7 @@ ZWave_helpFn($$)
   return "" if(!$mc);
   my $h = $mc->{config}{$cmd};
   return "" if(!$h || !$h->{Help});
-  return "Help for $cmd:<br>".$h->{Help}."<br><br>";
+  return "Help for $cmd:<br>".$h->{Help};
 }
 
 sub
@@ -1106,34 +1106,22 @@ ZWave_fhemwebFn($$$$)
 {
   my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
 
-  return "<div id=\"Help_$d\" class=\"help\"></div>".<<JSEND
-  <script type="text/javascript">
-    var oldHelp={};
-    var helpDiv=document.querySelector("#Help_$d");
-
-    setTimeout(function() { // Wait for it to appear, thn move it
-      var w=document.querySelector("div.makeTable.wide");
-      w.insertBefore(helpDiv,w.firstChild);
-    }, 200);
-
-    function helpSet(val) { helpDiv.innerHTML=val; }
-    function
-    helpCheck(name)
-    {
-      var sel = document.querySelector("select."+name);
-      if(!sel)
-        return;
-      var newVal = sel.options[sel.selectedIndex].value;
-      if(oldHelp[name] && oldHelp[name] != newVal) {
-        FW_queryValue('{ZWave_helpFn("$d","'+newVal+'")}', 'helpSet("%")', '');
-      }
-      oldHelp[name] = newVal;
-    }
-
-    setInterval(function() {
-      helpCheck("set");
-      helpCheck("get");
-    }, 300);
+  return
+  '<div id="ZWHelp" class="makeTable help"></div>'.
+  '<script type="text/javascript">'.
+   "var d='$d';" . <<'JSEND'
+    $(document).ready(function() {
+      $("div#ZWHelp").insertBefore("div.makeTable.wide:first"); // Move
+      $("select.set,select.get").each(function(){
+        $(this).get(0).setValueFn = function(val) {
+          $("div#ZWHelp").html(val);
+        }
+        $(this).change(function(){
+          FW_queryValue('{ZWave_helpFn("'+d+'","'+$(this).val()+'")}',
+                        $(this).get(0));
+        });
+      });
+    });
   </script>
 JSEND
 }
diff --git a/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz b/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz
index 2e9221450..38acb7329 100644
Binary files a/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz and b/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz differ
diff --git a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
index cef642052..5566fbf2d 100644
--- a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
+++ b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
@@ -524,6 +524,7 @@
 		<Product type="0100" id="0004" name="ZME_WCD2 Double Paddle Wall Controller" config="zwave.me/ZME_WCD2.xml"/>
 		<Product type="0201" id="0001" name="iTemp" config="zwave.me/iTemp.xml" />
 		<Product type="0200" id="0001" name="iTemp" config="zwave.me/iTemp.xml" />
+		<Product type="0100" id="0101" name="ZME_WALLC-S 4 Button Wall Controller" config="zwave.me/ZME_WALLC-S.xml"/>
 	</Manufacturer>
 	<Manufacturer id="004f" name="Z-Wave Technologia">
 	</Manufacturer>