diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
new file mode 100644
index 00000000000..e3540c72874
--- /dev/null
+++ b/source/_components/ecobee.markdown
@@ -0,0 +1,36 @@
+---
+layout: component
+title: "Ecobee thermostat"
+description: "Instructions for how to integrate Ecobee thermostats and sensors within Home Assistant."
+date: 2015-11-30 17:54
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ecobee.png
+ha_category: Hub
+---
+
+
+The Ecobee platform lets you control a thermostats and view sensor data from the [Ecobee](https://ecobee.com)
+thermostat.
+
+You will need to obtain an API key from ecobee's [developer site](https://www.ecobee.com/developers/) to use this component.
+The first time you run Home-Assistant with this component it will give you a PIN code that you need to authorize in the
+[ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html).  You can do this by clicking 'Add Application' in the 'My Apps' section in the sidebar.
+
+To set it up, add the following information to your `configuration.yaml` file:
+
+```yaml
+ecobee:
+  api_key: 
+```
+
+Configuration variables:
+
+- **api_key** (*Required*): Your Ecobee api key.
+
+<p class='img'>
+  <img src='{{site_root}}/images/screenshots/ecobee-sensor-badges.png' />
+  <img src='{{site_root}}/images/screenshots/ecobee-thermostat-card.png' />
+</p>
diff --git a/source/_components/sensor.ecobee.markdown b/source/_components/sensor.ecobee.markdown
new file mode 100644
index 00000000000..ec9fcf8338c
--- /dev/null
+++ b/source/_components/sensor.ecobee.markdown
@@ -0,0 +1,14 @@
+---
+layout: component
+title: "Ecobee sensor"
+description: "Instructions how to setup the Ecobee sensors within Home Assistant."
+date: 2015-11-30 18:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ecobee.png
+ha_category: Sensor
+---
+
+To get your Ecobee sensors working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).
diff --git a/source/_components/thermostat.ecobee.markdown b/source/_components/thermostat.ecobee.markdown
new file mode 100644
index 00000000000..a636a392cc5
--- /dev/null
+++ b/source/_components/thermostat.ecobee.markdown
@@ -0,0 +1,14 @@
+---
+layout: component
+title: "Ecobee thermostat"
+description: "Instructions how to setup the Ecobee thermostats within Home Assistant."
+date: 2015-11-30 18:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ecobee.png
+ha_category: Sensor
+---
+
+To get your Ecobee thermostats working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).
diff --git a/source/components/ecobee.html b/source/components/ecobee.html
new file mode 100644
index 00000000000..6e1bdaae3fe
--- /dev/null
+++ b/source/components/ecobee.html
@@ -0,0 +1 @@
+<script>document.location = '/components/ecobee/';</script>
diff --git a/source/components/sensor.ecobee.html b/source/components/sensor.ecobee.html
new file mode 100644
index 00000000000..34eaf9c2b92
--- /dev/null
+++ b/source/components/sensor.ecobee.html
@@ -0,0 +1 @@
+<script>document.location = '/components/sensor.ecobee/';</script>
diff --git a/source/components/thermostat.ecobee.html b/source/components/thermostat.ecobee.html
new file mode 100644
index 00000000000..a2c13b37f1a
--- /dev/null
+++ b/source/components/thermostat.ecobee.html
@@ -0,0 +1 @@
+<script>document.location = '/components/thermostat.ecobee/';</script>
diff --git a/source/images/screenshots/ecobee-sensor-badges.png b/source/images/screenshots/ecobee-sensor-badges.png
new file mode 100644
index 00000000000..3584d151443
Binary files /dev/null and b/source/images/screenshots/ecobee-sensor-badges.png differ
diff --git a/source/images/screenshots/ecobee-thermostat-card.png b/source/images/screenshots/ecobee-thermostat-card.png
new file mode 100644
index 00000000000..c3741930938
Binary files /dev/null and b/source/images/screenshots/ecobee-thermostat-card.png differ
diff --git a/source/images/supported_brands/ecobee.png b/source/images/supported_brands/ecobee.png
new file mode 100644
index 00000000000..6843a4b1c30
Binary files /dev/null and b/source/images/supported_brands/ecobee.png differ