diff --git a/source/_components/climate.netatmo.markdown b/source/_components/climate.netatmo.markdown
new file mode 100644
index 000000000000..900aacb5efaf
--- /dev/null
+++ b/source/_components/climate.netatmo.markdown
@@ -0,0 +1,46 @@
+---
+layout: page
+title: "Netatmo Thermostat"
+description: "Instructions how to integrate Netatmo thermostat into Home Assistant."
+date: 2016-11-10 08:10
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: netatmo.png
+ha_category: Climate
+ha_release: 0.31
+---
+
+### {% linkable_title Basic Configuration %}
+
+The `netatmo` thermostat platform is consuming the information provided by a [Netatmo Smart Thermostat](https://www.netatmo.com/product/energy/thermostat) thermostat. This component allows you to view the current temperature and setpoint.
+
+To enable the Netatmo thermostat, you first have to set up [netatmo](/components/netatmo/), this will use discovery to add your thermostat.
+
+### {% linkable_title Basic Configuration %}
+
+If you want to select a specific thermostat, set discovery to False for [netatmo](/components/netatmo/) and add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+climate:
+  platform: netatmo
+```
+
+Configuration variables:
+
+- **relay** (*Optional*): Will display the thermostats of this relay only.
+- **thermostat** array (*Optional*): Thermostat to use.
+    - **thermostat_name**: Name of the thermostat to display.
+
+If **relay** and **thermostat** are not provided, all thermostats will be displayed.
+
+```yaml
+# Example configuration.yaml entry
+climate:
+  platform: netatmo
+  relay: relay_name
+  thermostat:
+    - thermostat_name
+```
diff --git a/source/_components/netatmo.markdown b/source/_components/netatmo.markdown
index ff6ac53af1b5..286f0b78fe71 100644
--- a/source/_components/netatmo.markdown
+++ b/source/_components/netatmo.markdown
@@ -13,7 +13,7 @@ ha_release: "0.20"
 ---
 
 
-The `netatmo` component platform is the main component to integrate all Netatmo related platforms. Besides this component you will have to setup any connected sensors separately.
+The `netatmo` component platform is the main component to integrate all Netatmo related platforms.
 
 To enable the Netatmo component, add the following lines to your `configuration.yaml`:
 
@@ -32,6 +32,7 @@ Configuration variables:
 - **secret_key** (*Required*): Your netatmo secret key
 - **username** (*Required*): Username for the netatmo account.
 - **password** (*Required*): Password for the netatmo account.
+- **discovery** (*Optional)*: Whether to discover Netatmo devices. Set it to False, if you want to choose which Netatmo device you want to add (default True).
 
 ### {% linkable_title Get API and Secret Key %}
 
@@ -54,5 +55,5 @@ That's it. You can copy and paste your new API and secret keys in your Home Assi
 </p>
 
 <p class='note'>
-The Home Assistant NetAtmo platform has only be tested with the classic indoor, outdoor module and rainmeter. There is no support for the windmeter module at this time because developers does not own these modules.
+The Home Assistant Netatmo platform has only be tested with the classic indoor, outdoor module and rainmeter. There is no support for the windmeter module at this time because developers does not own these modules.
 </p>