diff --git a/source/_components/climate.tado.markdown b/source/_components/climate.tado.markdown
index e62a19a3399..5119f524c09 100644
--- a/source/_components/climate.tado.markdown
+++ b/source/_components/climate.tado.markdown
@@ -13,20 +13,8 @@ ha_release: 0.41
 ---
 
 
-The `tado` component platform is used as an interface to the my.tado.com website. It adds climate devices for every tado zone and sensors for some additional information of the zones.
+The `tado` climate platform is interact with your climate devices.
 
-To use your tado thermostats in your installation, add the following to your `configuration.yaml` file:
 
-```yaml
-# Example configuration.yaml entry
-tado:
-    username: YOUR_USERNAME
-    password: YOUR_PASSWORD
-```
+The requirement is that you have set up the [tado](/components/tado/) component.
 
-- **username** (*Required*): Username for my.tado.com.
-- **password** (*Required*): Password for my.tado.com.
-
-The tado thermostats are internet connected thermostats. There exists an unofficial api at my.tado.com, which is used by theire website and now by this component.
-
-It currently supports presenting the current temperature, the setting temperature and the current operation mode. Switching the mode is also supported. If no user is at home anymore, the devices are showing the away-state. Switching to away-mode is not supported.
\ No newline at end of file
diff --git a/source/_components/sensor.tado.markdown b/source/_components/sensor.tado.markdown
new file mode 100644
index 00000000000..6f127869b5b
--- /dev/null
+++ b/source/_components/sensor.tado.markdown
@@ -0,0 +1,19 @@
+---
+layout: page
+title: "Tado Sensor"
+description: "Instructions on how to integrate Tado thermostats with Home Assistant."
+date: 2017-03-20 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tado.png
+ha_category: Sensor
+ha_release: 0.41
+---
+
+The `tado` sensor platform allow you to monitor your tado climate devices.
+
+
+The requirement is that you have set up the [tado](/components/tado/) component.
+
diff --git a/source/_components/tado.markdown b/source/_components/tado.markdown
new file mode 100644
index 00000000000..50f98e19098
--- /dev/null
+++ b/source/_components/tado.markdown
@@ -0,0 +1,34 @@
+---
+layout: page
+title: "Tado"
+description: "Instructions on how to integrate Tado devices with Home Assistant."
+date: 2017-03-20 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tado.png
+ha_category: Hub
+ha_release: 0.41
+---
+
+
+The `tado` component platform is used as an interface to the [my.tado.com](https://my.tado.com/webapp/#/account/sign-in) website. It adds climate devices for every tado zone and sensors for some additional information of the zones.
+
+To use your tado thermostats in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+tado:
+  username: YOUR_USERNAME
+  password: YOUR_PASSWORD
+```
+
+Configuration variables:
+
+- **username** (*Required*): Username for my.tado.com.
+- **password** (*Required*): Password for my.tado.com.
+
+The tado thermostats are internet connected thermostats. There exists an unofficial API at [my.tado.com](https://my.tado.com/webapp/#/account/sign-in), which is used by their website and now by this component.
+
+It currently supports presenting the current temperature, the setting temperature and the current operation mode. Switching the mode is also supported. If no user is at home anymore, the devices are showing the away-state. Switching to away-mode is not supported.