diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 24293cb7d..1becef91c 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -884,16 +884,17 @@ ZWave_configParseModel($)
 
   my ($line, $class, %hash, $cmdName);
   while($gz->gzreadline($line)) {       # Search the "file" entry
-    last if($line =~ m/^<Product sourceFile="$cfg">$/);
+    last if($line =~ m/^\s*<Product.*sourceFile="$cfg"/);
   }
 
   while($gz->gzreadline($line)) {
-    last if($line =~ m+^</Product>+);
-    $class = $1 if($line =~ m/^<CommandClass.*id="([^"]*)"/);
+    last if($line =~ m+^\s*</Product>+);
+    $class = $1 if($line =~ m/^\s*<CommandClass.*id="([^"]*)"/);
     next if(!$class || $class ne "112");
-    if($line =~ m/^<Value /) {
+    if($line =~ m/^\s*<Value /) {
       my %h;
       $h{type}  = $1 if($line =~ m/type="([^"]*)"/i);
+      $h{size}  = $1 if($line =~ m/size="([^"]*)"/i);
       $h{genre} = $1 if($line =~ m/genre="([^"]*)"/i); # config, user
       $h{label} = $1 if($line =~ m/label="([^"]*)"/i);
       $h{min}   = $1 if($line =~ m/min="([^"]*)"/i);
@@ -908,8 +909,8 @@ ZWave_configParseModel($)
       $h{Help} .= "Full text for $cmdName is $h{label}<br>" if($shortened);
       $hash{$cmdName} = \%h;
     }
-    $hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^<Help>(.*)</Help>$+);
-    if($line =~ m/^<Item/) {
+    $hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^\s*<Help>(.*)</Help>$+);
+    if($line =~ m/^\s*<Item/) {
       my $label = $1 if($line =~ m/label="([^"]*)"/i);
       my $value = $1 if($line =~ m/value="([^"]*)"/i);
       my ($item, $shortened) = ZWave_cleanString($label, $value);
@@ -970,6 +971,10 @@ ZWave_configCheckParam($$$$@)
 
   return ("Parameter is not decimal", "") if($arg[0] !~ m/^[0-9]+$/);
 
+  if($h->{size}) { # override type by size
+    $t = ($h->{size} eq "1" ? "byte" : ($h->{size} eq "2" ? "short" : "int"));
+  }
+
   my $len = ($t eq "int" ? 8 : ($t eq "short" ? 4 : 2));
   return ("", sprintf("04%02x%02x%0*x", $h->{index}, $len/2, $len, $arg[0]));
 }
diff --git a/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz b/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz
index 38acb7329..cf85c4d27 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 5566fbf2d..65449c5f0 100644
--- a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
+++ b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
@@ -194,7 +194,7 @@
 		<Product type="0400" id="0107" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
 		<Product type="0400" id="0108" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
 		<Product type="0400" id="0109" name="FGS221 Switch 3kW" config="fibaro/fgs221.xml" />
-		<Product type="0400" id="100a" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
+		<Product type="0400" id="100a" name="FGS211 Switch 3kW" config="fibaro/fgs211v102.xml" />
 		<Product type="0200" id="0104" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />
 		<Product type="0200" id="0105" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />
 		<Product type="0200" id="0106" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />