diff --git a/source/_components/cover.tahoma.markdown b/source/_components/cover.tahoma.markdown
new file mode 100644
index 00000000000..9dfebff30f9
--- /dev/null
+++ b/source/_components/cover.tahoma.markdown
@@ -0,0 +1,21 @@
+---
+layout: page
+title: "Tahoma Cover"
+description: "Instructions how to integrate Tahoma covers into Home Assistant."
+date: 2017-07-18 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tahoma.png
+ha_category: Cover
+ha_release: 0.59
+---
+
+To use your tahoma covers in your installation, add the following to your `configuration.yaml` file:
+
+``yaml
+# Example configuration.yml entry
+cover:
+  platform: tahoma
+```
\ No newline at end of file
diff --git a/source/_components/sensor.tahoma.markdown b/source/_components/sensor.tahoma.markdown
new file mode 100644
index 00000000000..1b373ac81ce
--- /dev/null
+++ b/source/_components/sensor.tahoma.markdown
@@ -0,0 +1,21 @@
+---
+layout: page
+title: "Tahoma Sensor"
+description: "Instructions how to integrate Tahoma sensors into Home Assistant."
+date: 2017-07-18 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tahoma.png
+ha_category: Cover
+ha_release: 0.59
+---
+
+To use your tahoma sensors in your installation, add the following to your `configuration.yaml` file:
+
+``yaml
+# Example configuration.yml entry
+sensor:
+  platform: tahoma
+```
\ No newline at end of file
diff --git a/source/_components/tahoma.markdown b/source/_components/tahoma.markdown
new file mode 100644
index 00000000000..e6e272d8b48
--- /dev/null
+++ b/source/_components/tahoma.markdown
@@ -0,0 +1,41 @@
+---
+layout: page
+title: "Tahoma"
+description: "Instructions on how to integrate Somfy Tahoma devices with Home Assistant."
+date: 2017-07-18 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: tahoma.png
+ha_category: Hub
+ha_release: 0.59
+---
+
+
+The `Tahoma` component platform is used as an interface to the [tahomalink.com](https://www.tahomalink.com) website. It adds actually covers and the sun sensor from tahoma platform.
+
+To use your Tahoma devices in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+tahoma:
+  username: YOUR_USERNAME
+  password: YOUR_PASSWORD
+  exclude: [BridgeHUEComponent, HueLampHUEComponent, PodComponent]
+```
+
+{% configuration %}
+username:
+  description: Username for tahomalink.com
+  required: true
+  type: string
+password:
+  description: Password for tahomalink.com
+  required: true
+  type: string
+exclude:
+  description: Excludes devices
+  required: false
+  type: list
+{% endconfiguration %}
\ No newline at end of file
diff --git a/source/images/supported_brands/tahoma.png b/source/images/supported_brands/tahoma.png
new file mode 100644
index 00000000000..e0c8f87b1f0
Binary files /dev/null and b/source/images/supported_brands/tahoma.png differ