diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 03b46ce16..9ccb36520 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -180,12 +180,17 @@ my %zwave_class = (
   THERMOSTAT_MODE          => { id => '40',
     set   => { tmOff       => "0100",
                tmHeating   => "0101",
+               tmCooling   => "0102",
+               tmFan       => "0106",
+               tmAuto      => "0103",
                tmEnergySaveHeating => "010b",
                tmManual    => "011f" },
     get   => { thermostatMode => "02" },
     parse => { "03400300"  => "thermostatMode:off",
-               "0340030b"  => "thermostatMode:energySaveHeating",
                "03400301"  => "thermostatMode:heating",
+               "03400302"  => "thermostatMode:cooling",
+               "03400306"  => "thermostatMode:fanOnly",
+               "0340030b"  => "thermostatMode:energySaveHeating",
                "0340031f"  => "thermostatMode:manual",
                "03400100"  => "thermostatMode:setTmOff",
                "03400101"  => "thermostatMode:setTmHeating",
@@ -220,8 +225,33 @@ my %zwave_class = (
     parse => {  "..4303(.*)" => 'ZWave_thermostatSetpointParse($hash, $1)',
                 "..4305(.*)" =>
                         'ZWave_thermostatSetpointSupportedParse($hash, $1)' } },
-  THERMOSTAT_FAN_MODE      => { id => '44' },
-  THERMOSTAT_FAN_STATE     => { id => '45' },
+  THERMOSTAT_FAN_MODE      => { id => '44',
+    set   => { fanAutoLow    => "0100",
+               fanLow        => "0101",
+               fanAutoHigh   => "0102",
+               fanHigh       => "0103",
+               fanAutoMedium => "0104",
+               fanMedium     => "0105" },
+    get   => { fanMode => "02" },
+    parse => { "03440300"  => "fanMode:fanAutoLow",
+               "03440301"  => "fanMode:fanLow",
+               "03440302"  => "fanMode:fanAutoHigh",
+               "03440303"  => "fanMode:fanHigh",
+               "03440304"  => "fanMode:fanAutoMedium",
+               "03440305"  => "fanMode:fanMedium"
+               } } ,
+  THERMOSTAT_FAN_STATE     => { id => '45',
+    get   => { fanState => "02" },
+    parse => { "03450300"  => "fanState:off",
+               "03450301"  => "fanState:low",
+               "03450302"  => "fanState:high",
+               "03450303"  => "fanState:medium",
+               "03450304"  => "fanState:circulation",
+               "03450305"  => "fanState:humidityCirc",
+               "03450306"  => "fanState:rightLeftCirc",
+               "03450307"  => "fanState:upDownCirc",
+               "03450308"  => "fanState:quietCirc"
+               } } ,
   CLIMATE_CONTROL_SCHEDULE => { id => '46',
     set   => { ccs                => 'ZWave_ccsSet("%s")' ,
                ccsOverride        => 'ZWave_ccsSetOverride("%s")'},