diff --git a/fhem/FHEM/00_MAXLAN.pm b/fhem/FHEM/00_MAXLAN.pm
index 4892401c9..e7b4875db 100755
--- a/fhem/FHEM/00_MAXLAN.pm
+++ b/fhem/FHEM/00_MAXLAN.pm
@@ -522,9 +522,10 @@ MAXLAN_Parse($$)
 
     #devicetype: Cube = 0, HeatingThermostat = 1, HeatingThermostatPlus = 2, WallMountedThermostat = 3, ShutterContact = 4, PushButton = 5
     #Seems that ShutterContact does not have any configdata
-    if($devicetype == 0){#Cube
+    if($device_types{$devicetype} eq "Cube"){
       #TODO: there is a lot of data left to interpret
-    }elsif($devicetype == 1 or $devicetype == 3){#HeatingThermostat or #WallMountedThermostat
+
+    }elsif($device_types{$devicetype} eq "HeatingThermostat"){
       my ($comforttemp,$ecotemp,$maxsetpointtemp,$minsetpointtemp,$tempoffset,$windowopentemp,$windowopendur,$boost,$decalcifiction,$maxvalvesetting,$valveoffset,$weekprofile) = unpack("CCCCCCCCCCCH*",substr($bindata,18));
       #TODO: parse week profile
       my $boostValve = ($boost & 0x1F) * 5;
@@ -542,9 +543,18 @@ MAXLAN_Parse($$)
       my $decalcDay       = ($decalcifiction >> 5) & 0x07;
       my $decalcTime      = $decalcifiction & 0x1F;
       Log $ll5, "comfortemp $comforttemp, ecotemp $ecotemp, boostValve $boostValve, boostDuration $boostDuration, tempoffset $tempoffset, minsetpointtemp $minsetpointtemp, maxsetpointtemp $maxsetpointtemp, windowopentemp $windowopentemp, windowopendur $windowopendur";
-      Dispatch($hash, "MAX,1,ThermostatConfig,$addr,$ecotemp,$comforttemp,$boostValve,$boostDuration,$tempoffset,$maxsetpointtemp,$minsetpointtemp,$windowopentemp,$windowopendur,$maxvalvesetting,$valveoffset,$decalcDay,$decalcTime,$weekprofile", {RAWMSG => $rmsg});
+      Dispatch($hash, "MAX,1,HeatingThermostatConfig,$addr,$ecotemp,$comforttemp,$maxsetpointtemp,$minsetpointtemp,$boostValve,$boostDuration,$tempoffset,$windowopentemp,$windowopendur,$maxvalvesetting,$valveoffset,$decalcDay,$decalcTime,$weekprofile", {RAWMSG => $rmsg});
 
-    }elsif($devicetype == 4){#ShutterContact
+    }elsif($device_types{$devicetype} eq "WallMountedThermostat"){
+      my ($comforttemp,$ecotemp,$maxsetpointtemp,$minsetpointtemp,$weekprofile) = unpack("CCCCH*",substr($bindata,18));
+      $comforttemp /= 2.0; #convert to degree celcius
+      $ecotemp /= 2.0; #convert to degree celcius
+      $maxsetpointtemp /= 2.0;
+      $minsetpointtemp /= 2.0;
+      Log $ll5, "comfortemp $comforttemp, ecotemp $ecotemp, minsetpointtemp $minsetpointtemp, maxsetpointtemp $maxsetpointtemp";
+      Dispatch($hash, "MAX,1,WallThermostatConfig,$addr,$ecotemp,$comforttemp,$maxsetpointtemp,$minsetpointtemp,$weekprofile", {RAWMSG => $rmsg});
+
+    }elsif($device_types{$devicetype} eq "ShutterContact"){
       Log 2, "MAXLAN_Parse: ShutterContact send some configuration, but none was expected" if($len > 18);
     }else{ #TODO
       Log 2, "MAXLAN_Parse: Got configdata for unimplemented devicetype $devicetype";
diff --git a/fhem/FHEM/10_MAX.pm b/fhem/FHEM/10_MAX.pm
index bbb3cf8c5..3c1b70285 100755
--- a/fhem/FHEM/10_MAX.pm
+++ b/fhem/FHEM/10_MAX.pm
@@ -458,21 +458,25 @@ MAX_Parse($$)
 
     readingsBulkUpdate($shash, "connection", $connected);
 
-  } elsif($msgtype eq "ThermostatConfig") {
+  } elsif($msgtype ~~ ["HeatingThermostatConfig", "WallThermostatConfig"]) {
     readingsBulkUpdate($shash, "ecoTemperature", $args[0]);
     readingsBulkUpdate($shash, "comfortTemperature", $args[1]);
-    readingsBulkUpdate($shash, "boostValveposition", $args[2]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "boostDuration", $args[3]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "measurementOffset", $args[4]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "maximumTemperature", $args[5]);
-    readingsBulkUpdate($shash, "minimumTemperature", $args[6]);
-    readingsBulkUpdate($shash, "windowOpenTemperature", $args[7]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "windowOpenDuration", $args[8]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "maxValveSetting", $args[9]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "valveOffset", $args[10]) if($shash->{type} eq "HeatingThermostat");
-    readingsBulkUpdate($shash, "decalcification", "$decalcDays[$args[11]], $args[12]:00");
+    readingsBulkUpdate($shash, "maximumTemperature", $args[2]);
+    readingsBulkUpdate($shash, "minimumTemperature", $args[3]);
+    if($shash->{type} eq "HeatingThermostat") {
+      readingsBulkUpdate($shash, "boostValveposition", $args[4]);
+      readingsBulkUpdate($shash, "boostDuration", $args[5]);
+      readingsBulkUpdate($shash, "measurementOffset", $args[6]);
+      readingsBulkUpdate($shash, "windowOpenTemperature", $args[7]);
+      readingsBulkUpdate($shash, "windowOpenDuration", $args[8]);
+      readingsBulkUpdate($shash, "maxValveSetting", $args[9]);
+      readingsBulkUpdate($shash, "valveOffset", $args[10]);
+      readingsBulkUpdate($shash, "decalcification", "$decalcDays[$args[11]], $args[12]:00");
+      $shash->{internal}{weekProfile} = $args[13];
+    } else {
+      $shash->{internal}{weekProfile} = $args[4];
+    }
 
-    $shash->{internal}{weekProfile} = $args[13];
     #parse weekprofiles for each day
     for (my $i=0;$i<7;$i++) {
       my (@time_prof, @temp_prof);
@@ -502,8 +506,8 @@ MAX_Parse($$)
         }
      }
 
-     readingsBulkUpdate($shash, "weekprofile-$decalcDays[$i]-time", $time_prof_str );
-     readingsBulkUpdate($shash, "weekprofile-$decalcDays[$i]-temp", $temp_prof_str );
+     readingsBulkUpdate($shash, "weekprofile-$i-$decalcDays[$i]-time", $time_prof_str );
+     readingsBulkUpdate($shash, "weekprofile-$i-$decalcDays[$i]-temp", $temp_prof_str );
 
      } # Endparse weekprofiles for each day
 
diff --git a/fhem/FHEM/14_CUL_MAX.pm b/fhem/FHEM/14_CUL_MAX.pm
index fc68943d6..80c45ae04 100644
--- a/fhem/FHEM/14_CUL_MAX.pm
+++ b/fhem/FHEM/14_CUL_MAX.pm
@@ -223,9 +223,9 @@ CUL_MAX_Parse($$)
         CUL_MAX_Send($shash, "PairPong", $src, "00");
         #TODO: wait for Ack
         Dispatch($shash, "MAX,$isToMe,define,$src,$device_types{$type},$serial,0,0", {RAWMSG => $rmsg});
-        if($device_types{$type} eq "HeatingThermostat" or $device_types{$type} eq "WallMountedThermostat") {
+        if($device_types{$type} eq "HeatingThermostat") {
           #This are the default values that a device has after factory reset or pairing
-          Dispatch($shash, "MAX,$isToMe,ThermostatConfig,$src,17,21,80,5,0,30.5,4.5,12,15", {RAWMSG => $rmsg});
+          Dispatch($shash, "MAX,$isToMe,HeatingThermostatConfig,$src,17,21,80,5,0,30.5,4.5,12,15", {RAWMSG => $rmsg});
         }
         #TODO: send TimeInformation
       }