diff --git a/source/_components/climate.melissa.markdown b/source/_components/climate.melissa.markdown
new file mode 100644
index 00000000000..9d648a83b59
--- /dev/null
+++ b/source/_components/climate.melissa.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Melissa Climate"
+description: "Instructions on how to integrate Melissa climate system (HVAC) into Home Assistant."
+date: 2018-01-08 20:21
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: mclimate.png
+ha_category: Climate
+ha_iot_class: "Cloud Polling"
+ha_release: 0.63
+---
+
+The `Melissa` climate platform allows you to control your [Melissa Climate](http://seemelissa.com/) from within Home Assistant.
+
+The climate platform will be automatically configured if Melissa component is configured.
+
+For more configuration information see the [Melissa component](/components/melissa/) documentation.
diff --git a/source/_components/melissa.markdown b/source/_components/melissa.markdown
new file mode 100644
index 00000000000..ffc6364fc99
--- /dev/null
+++ b/source/_components/melissa.markdown
@@ -0,0 +1,37 @@
+---
+layout: page
+title: "Melissa Climate"
+description: "Instructions how to integrate Melissa Climate into Home Assistant."
+date: 2017-01-05 17:30
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: mclimate.png
+ha_category: Hub
+featured: false
+ha_release: 0.63
+ha_iot_class: "Cloud Polling"
+---
+
+The `Melissa` component is the main component to connect to a [Melissa Climate](http://seemelissa.com/) A/C control.
+
+To set the Melissa component up, add the following information to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+melissa:
+  username: <email adress>
+  password: ********
+```
+
+{% configuration %}
+  username:
+    description: The username for accessing your Melissa account.
+    required: true
+    type: string
+  password:
+    description: The password for accessing your Melissa account.
+    required: true
+    type: string
+{% endconfiguration %}
diff --git a/source/_components/sensor.melissa.markdown b/source/_components/sensor.melissa.markdown
new file mode 100644
index 00000000000..4b18248d522
--- /dev/null
+++ b/source/_components/sensor.melissa.markdown
@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Melissa Sensor"
+description: "Instructions on how to integrate Melissa sensors into Home Assistant."
+date: 2017-08-30 12:21
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: mclimate.png
+ha_category: Sensor
+ha_iot_class: "Cloud Polling"
+ha_release: 0.63
+---
+
+The `Melissa` platform allows you to get data from your [Melissa](http://seemelissa.com/) sensors from within Home Assistant.
+  
+The sensor platform will be automatically configured if Melissa component is configured.
+
+For more configuration information see the [Melissa component](/components/melissa/) documentation.
diff --git a/source/images/supported_brands/mclimate.png b/source/images/supported_brands/mclimate.png
new file mode 100644
index 00000000000..0f5e4ed3725
Binary files /dev/null and b/source/images/supported_brands/mclimate.png differ