diff --git a/source/_components/binary_sensor.raincloud.markdown b/source/_components/binary_sensor.raincloud.markdown
new file mode 100644
index 00000000000..b5e1678d53b
--- /dev/null
+++ b/source/_components/binary_sensor.raincloud.markdown
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "Melnor Raincloud Binary Sensor"
+description: "Instructions on how to integrate your Melnor Raincloud sprinkler system within Home Assistant."
+date: 2017-09-04 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: raincloud.jpg
+ha_category: Binary Sensor
+ha_release: "0.55"
+ha_iot_class: "Cloud Polling"
+---
+
+To get your [Melnor RainCloud](https://wifiaquatimer.com) binary sensors working within Home Assistant, please follow the instructions for the general [Raincloud component](/components/raincloud).
+
+Once you have enabled the [Raincloud component](/components/raincloud), add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: raincloud
+```
+
+Configuration variables:
+
+- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. If not specified, all conditions below will be enabled by default. The following conditions can be monitored.
+  - **is_watering**: Return if is currently watering per zone.
+  - **status**: Return status from the Melnor RainCloud Controller and Melnor RainCloud Faucet.
diff --git a/source/_components/raincloud.markdown b/source/_components/raincloud.markdown
new file mode 100644
index 00000000000..6e4e3919a06
--- /dev/null
+++ b/source/_components/raincloud.markdown
@@ -0,0 +1,33 @@
+---
+layout: page
+title: "Melnor Raincloud"
+description: "Instructions on how to integrate your Melnor Raincloud sprinkler system within Home Assistant."
+date: 2017-09-04 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: raincloud.jpg
+ha_category: Hub
+ha_release: 0.55
+---
+
+The `raincloud` component allows you to integrate your [Melnor RainCloud](https://wifiaquatimer.com) sprinkler system in Home Assistant.
+
+To enable it, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+
+raincloud:
+  username: you@example.com
+  password: secret
+```
+
+Configuration variables:
+
+- **username** (*Required*): The username for accessing your Melnor RainCloud account.
+- **password** (*Required*): The password for accessing your Melnor RainCloud account.
+- **scan_interval** (*Optional*): Defines the update interval of the sensor in seconds. Defaults to 20seconds.
+
+Finish its configuration by visiting the [Raincloud binary sensor](/components/binary_sensor.raincloud/), [Raincloud sensor](/components/sensor.raincloud/) and [Raincloud switch](/components/switch.raincloud/) documentation.
diff --git a/source/_components/sensor.raincloud.markdown b/source/_components/sensor.raincloud.markdown
new file mode 100644
index 00000000000..381599c785e
--- /dev/null
+++ b/source/_components/sensor.raincloud.markdown
@@ -0,0 +1,32 @@
+---
+layout: page
+title: "Melnor Raincloud Sensor"
+description: "Instructions on how to integrate your Melnor Raincloud sprinkler system within Home Assistant."
+date: 2017-09-04 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: raincloud.jpg
+ha_category: Sensor
+ha_release: "0.55"
+ha_iot_class: "Cloud Polling"
+---
+
+To get your [Melnor RainCloud](https://wifiaquatimer.com) sensors working within Home Assistant, please follow the instructions for the general [Raincloud component](/components/raincloud).
+
+Once you have enabled the [Raincloud component](/components/raincloud), add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: raincloud
+```
+
+Configuration variables:
+
+- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. If not specified, all conditions below will be enabled by default. The following conditions can be monitored.
+  - **battery**: Return the battery level the Melnor RainCloud faucet.
+  - **next_cycle**: Return the next schedulle watering cycle per zone.
+  - **rain_delay**: Return the number of days the automatic watering will be delayed due to raining per zone.
+  - **watering_time**: Return the watering remaining minutes per zone.
diff --git a/source/_components/switch.raincloud.markdown b/source/_components/switch.raincloud.markdown
new file mode 100644
index 00000000000..e5cbc2d070b
--- /dev/null
+++ b/source/_components/switch.raincloud.markdown
@@ -0,0 +1,31 @@
+---
+layout: page
+title: "Melnor Raincloud Switch"
+description: "Instructions on how to integrate your Melnor Raincloud sprinkler system within Home Assistant."
+date: 2017-09-04 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: raincloud.jpg
+ha_category: Switch
+ha_release: "0.55"
+ha_iot_class: "Cloud Polling"
+---
+
+To get your [Melnor RainCloud](https://wifiaquatimer.com) binary sensors working within Home Assistant, please follow the instructions for the general [Raincloud component](/components/raincloud).
+
+Once you have enabled the [Raincloud component](/components/raincloud), add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: raincloud
+```
+
+Configuration variables:
+
+- **watering_minutes** (*Optional*): Value in minutes to watering your garden via frontend. Defaults to 15.
+- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. If not specified, all conditions below will be enabled by default. The following conditions can be monitored.
+  - **auto_watering**: Toggle the watering scheduled per zone.
+  - **manual_watering**: Toggle manually the watering per zone. It will inherent the value in minutes specified on the RainCloud hub component.
diff --git a/source/images/supported_brands/raincloud.jpg b/source/images/supported_brands/raincloud.jpg
new file mode 100644
index 00000000000..81957811fb7
Binary files /dev/null and b/source/images/supported_brands/raincloud.jpg differ