diff --git a/source/_components/climate.knx.markdown b/source/_components/climate.knx.markdown
index 1c740bba30c..b5b59a01e36 100644
--- a/source/_components/climate.knx.markdown
+++ b/source/_components/climate.knx.markdown
@@ -25,10 +25,11 @@ To use your KNX thermostats in your installation, add the following lines to you
 climate:
    - platform: knx
      name: HASS-Kitchen.Temperature
-     temperature_address: '6/2/1'
-     setpoint_address: '5/1/2'
-     target_temperature_address: '5/1/1'
-     operation_mode_address: '5/1/3'
+     temperature_address: '5/1/1'
+     setpoint_shift_address: '5/1/2'
+     setpoint_shift_state_address: '5/1/3'
+     target_temperature_address: '5/1/4'
+     operation_mode_address: '5/1/5'
 ```
 
 Alternatively, if your device has dedicated binary group addresses for frost/night/comfort mode:
@@ -38,12 +39,13 @@ Alternatively, if your device has dedicated binary group addresses for frost/nig
 climate:
   - platform: knx
     name: HASS-Kitchen.Temperature
-    temperature_address: '6/2/1'
-    setpoint_address: '5/1/2'
-    target_temperature_address: '5/1/1'
-    operation_mode_frost_protection_address: '5/1/3'
-    operation_mode_night_address: '5/1/4'
-    operation_mode_comfort_address: '5/1/5'
+    temperature_address: '5/1/1'
+    setpoint_shift_address: '5/1/2'
+    setpoint_shift_state_address: '5/1/3'
+    target_temperature_address: '5/1/4'
+    operation_mode_frost_protection_address: '5/1/5'
+    operation_mode_night_address: '5/1/6'
+    operation_mode_comfort_address: '5/1/7'
 ```
 
 Configuration variables:
@@ -51,7 +53,16 @@ Configuration variables:
 - **name** (*Optional*): A name for this device used within Home Assistant.
 - **temperature_address**: KNX group address for reading current room temperature from KNX bus.
 - **target_temperature_address**: KNX group address for reading current target temperature from KNX bus.
-- **setpoint_address**: KNX group address for basis setpoint
+
+The `knx` component sets the desired target temperature by modifying the setpoint_shift. The module provides the following configuration options:
+
+* **setpoint_shift_address**: (*Optional*) KNX address for setpoint_shift
+* **setpoint_shift_state_address**: (*Optional*) Explicit KNX address for reading setpoint_shift.
+* **setpoint_shift_step**: (*Optional*) Defines for step size in Kelvin for each step of setpoint_shift. Default is 0.5 K.
+* **setpoint_shift_min**: (*Optional*) Minimum value of setpoint shift. Default is "-6".
+* **setpoint_shift_max**: (*Optional*) Maximum value of setpoint shift. Default is "6".
+
+The operation modes may be controlled with the following directives:
 
 - **operation_mode_address** (*Optional*): KNX address for operation mode (Frost protection/night/comfort).
 - **operation_mode_state_address** (*Optional*): Explicit KNX address for reading operation mode
@@ -63,5 +74,3 @@ Configuration variables:
 - **operation_mode_comfort_address** (*Optional*): KNX address for switching on/off comfort mode.
 
 `operation_mode_frost_protection_address` / `operation_mode_night_address` / `operation_mode_comfort_address` are not necessary if `operation_mode_address` was specified.
-
-
diff --git a/source/_components/knx.markdown b/source/_components/knx.markdown
index b813ac3aee4..b48642e7ce5 100644
--- a/source/_components/knx.markdown
+++ b/source/_components/knx.markdown
@@ -18,6 +18,10 @@ The [KNX](http://www.knx.org) integration for Home Assistant allows you to conne
 
 The component requires a local KNX/IP interface like the [Weinzierl 730](http://www.weinzierl.de/index.php/en/all-knx/knx-devices-en/knx-ip-interface-730-en). Through this, it will send and receive commands to and from other devices to the KNX bus.
 
+<p class='note warning'>
+  Please note, the `knx` platform does not support Windows and needs at least python version 3.5.
+</p>
+
 There is currently support for the following device types within Home Assistant:
  
 - [Binary Sensor](/components/binary_sensor.knx)