diff --git a/source/_components/climate.zwave.markdown b/source/_components/climate.zwave.markdown
index c99149936fe..6d20fdc01e3 100644
--- a/source/_components/climate.zwave.markdown
+++ b/source/_components/climate.zwave.markdown
@@ -13,10 +13,10 @@ ha_release: 0.17
 ---
 
 
-To get your Z-Wave thermostat working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
+To get your Z-Wave thermostat or HVAC unit working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
 
 <p class='note'>
-If your thermostat support fan modes or different operating modes, it should be considered a [HVAC component](/components/hvac.zwave/), and will also be detected as one. Thermostat component does not support setting fan or operation mode. This is controlled via the HVAC component.
+Thermostats with support for fan modes or different operating modes, will be handled like a HVAC device and will also be detected as one. 
 
 If the thermostat support different operationg modes, you will get one thermostat entity for each mode. These can be hidden with settings using the customize setting in the `configuration.yaml` file.
 </p>