diff --git a/source/_components/binary_sensor.tesla.markdown b/source/_components/binary_sensor.tesla.markdown
new file mode 100644
index 00000000000..c7c1948ae39
--- /dev/null
+++ b/source/_components/binary_sensor.tesla.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Tesla Binary Sensor"
+description: "Instructions on how to integrate Tesla binary sensors into Home Assistant."
+date: 2017-08-30 12:29
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Binary Sensor
+ha_iot_class: "Cloud polling"
+ha_release: 0.53
+---
+
+The `Tesla` platform allows you to get data from your [Tesla](https://www.tesla.com/) sensors from within Home Assistant.
+  
+They will be automatically discovered if the Tesla component is loaded.
+
+For more configuration information see the [Tesla component](/components/tesla/) documentation.
diff --git a/source/_components/climate.tesla.markdown b/source/_components/climate.tesla.markdown
new file mode 100644
index 00000000000..1d5720f65a9
--- /dev/null
+++ b/source/_components/climate.tesla.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Tesla HVAC"
+description: "Instructions on how to integrate Tesla climate system (HVAC) into Home Assistant."
+date: 2017-08-30 12:20
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Climate
+ha_iot_class: "Cloud push"
+ha_release: 0.53
+---
+
+The `Tesla` climate platform allows you to control your [Tesla](https://www.tesla.com/) climate from within Home Assistant.
+
+The climate platform will be automatically configured if Tesla component is configured.
+
+For more configuration information see the [Tesla component](/components/tesla/) documentation.
diff --git a/source/_components/device_tracker.tesla.markdown b/source/_components/device_tracker.tesla.markdown
new file mode 100644
index 00000000000..68307d1057f
--- /dev/null
+++ b/source/_components/device_tracker.tesla.markdown
@@ -0,0 +1,19 @@
+---
+layout: page
+title: "Tesla"
+description: "Instructions on for how to integrate Tesla into Home Assistant."
+date: 2017-08-02 12:20
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Presence Detection
+ha_release: 0.53
+---
+
+The `Tesla` platform allows you to get data about the location of your [Tesla](https://www.tesla.com/) car within Home Assistant.
+
+The device tracker platform will be automatically configured if Tesla component is configured.
+
+For more configuration information see the [Tesla component](/components/tesla/) documentation.
diff --git a/source/_components/lock.tesla.markdown b/source/_components/lock.tesla.markdown
new file mode 100644
index 00000000000..402627d3778
--- /dev/null
+++ b/source/_components/lock.tesla.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Tesla Lock"
+description: "Instructions on how to integrate Tesla door lock into Home Assistant."
+date: 2017-08-30 12:20
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Lock
+ha_iot_class: "Coud Push"
+ha_release: 0.53
+---
+
+The `Tesla` platform allows you to control your [Tesla](https://www.tesla.com/) door lock from within Home Assistant.
+
+The lock platform will be automatically configured if Tesla component is configured.
+
+For more configuration information see the [Tesla component](/components/tesla/) documentation.
diff --git a/source/_components/sensor.tesla.markdown b/source/_components/sensor.tesla.markdown
new file mode 100644
index 00000000000..262a18910e2
--- /dev/null
+++ b/source/_components/sensor.tesla.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Tesla Sensor"
+description: "Instructions on how to integrate Tesla sensors into Home Assistant."
+date: 2017-08-30 12:21
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Sensor
+ha_iot_class: "Cloud Push"
+ha_release: 0.53
+---
+
+The `Tesla` platform allows you to get data from your [Tesla](https://www.tesla.com/) sensors from within Home Assistant.
+  
+The sensor platform will be automatically configured if Tesla component is configured.
+
+For more configuration information see the [Tesla component](/components/tesla/) documentation.
diff --git a/source/_components/tesla.markdown b/source/_components/tesla.markdown
new file mode 100644
index 00000000000..9e86043ab5a
--- /dev/null
+++ b/source/_components/tesla.markdown
@@ -0,0 +1,39 @@
+---
+layout: page
+title: "Tesla"
+description: "Instructions on how to integrate Tesla car into Home Assistant."
+date: 2017-08-28 17:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tesla.png
+ha_category: Hub
+ha_release: 0.53
+ha_iot_class: "Cloud Polling"
+---
+
+
+The `Tesla` component offers integration with the [Tesla](https://auth.tesla.com/login) cloud service and provides presence detection as well as sensors such as charger state and temperature.
+
+This component provides the following platforms:
+ - Binary sensors - such as parking and charger connection.
+ - Sensors - such as Battery level, Inside/Outside temperature.
+ - Device tracker - to track location of your car
+ - Lock - Door lock. Enables you to control Tesla's door lock
+ - Climate - HVAC control. Allow you to control (turn on/off, set target temperature) your Tesla's HVAC system.
+
+To use Tesla in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+tesla:
+  username: email
+  password: password
+```
+
+Configuration variables:
+
+- **username** (*Required*): The email address associated with your Tesla account.
+- **password** (*Required*): The password for your given Tesla account.
+- **scan_interval** (*Optional*): API polling interval. Minimal value can't be less then 300. (Defaults 300)
diff --git a/source/images/supported_brands/tesla.png b/source/images/supported_brands/tesla.png
new file mode 100644
index 00000000000..947cd01e813
Binary files /dev/null and b/source/images/supported_brands/tesla.png differ