diff --git a/source/_components/binary_sensor.fibaro.markdown b/source/_components/binary_sensor.fibaro.markdown
new file mode 100644
index 00000000000..56c0e7086e2
--- /dev/null
+++ b/source/_components/binary_sensor.fibaro.markdown
@@ -0,0 +1,18 @@
+---
+layout: page
+title: "Fibaro Binary Sensor"
+description: "Instructions on how to integrate Fibaro binary sensors into Home Assistant."
+date: 2018-11-14 23:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: fibaro.png
+ha_category: Binary Sensor
+ha_iot_class: "Local Push"
+ha_release: 0.83
+---
+
+The `fibaro` platform allows you to get data from your [Fibaro](http://fibaro.com/) binary sensors connected to your Fibaro HCL or HC2 from within Home Assistant.
+
+They will be automatically discovered if the `fibaro` component is loaded.
diff --git a/source/_components/fibaro.markdown b/source/_components/fibaro.markdown
new file mode 100644
index 00000000000..d7a69c04e73
--- /dev/null
+++ b/source/_components/fibaro.markdown
@@ -0,0 +1,56 @@
+---
+layout: page
+title: "Fibaro"
+description: "Instructions on how to setup Fibaro Z-Wave hubs (HCL and HC2) and configure devices within Home Assistant."
+date: 2018-11-14 20:04
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: fibaro.png
+ha_category: Hub
+ha_release: 0.83
+ha_iot_class: "Local Push"
+---
+
+The [Fibaro](http://fibaro.com) hub is a controller mainly connecting to Z-Wave devices.
+
+Switches, Lights (including Dimmers), Locks, Sensors, Binary sensors and Covers are supported - and will be automatically added when HA connects to your Fibaro controller.
+
+## {% linkable_title Configuration %}
+
+To use Fibaro devices in your installation, add the following to your configuration.yaml file using the IP and port number of your Fibaro controller:
+
+```yaml
+fibaro:
+  url: http://192.168.1.161/api/
+  username: your_username
+  password: your_password
+```
+
+{% configuration %}
+url:
+  description: The URL for your Fibaro HomeCenter device.
+  required: true
+  type: url
+username:
+  description: The username for your Fibaro account.
+  required: true
+  type: string
+password:
+  description: The password for your Fibaro account.
+  required: true
+  type: string
+plugins:
+  description: Whether to import plugin-generated devices from Fibaro HomeCenter, such as Netatmo and Sonos devices, etc. Default is false.
+  required: false
+  type: bool
+{% endconfiguration %}
+
+<p class='note'>
+  It is recommended to assign a static IP address to your Fibaro Controller. This ensures that it won't change IP addresses, so you won't have to change the 'url' if the controller reboots and comes up with a different IP address. See your router's manual for details on how to set this up. If you need the MAC address of your Fibaro, check the label on the bottom.
+</p>
+
+### {% linkable_title Using Z-Wave devices in automation %}
+
+If you want to use a Z-Wave device from the Fibaro controller in Home Assistant automation, you'll need the entity id. In the Home Assistant UI you'll find all entities listed under the <img src='/images/screenshots/developer-tool-states-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> icon of the Developer Tools section. Look for entities that contain 'Fibaro Device Id' in their attributes, and you'll find the entity id on the left.
diff --git a/source/images/supported_brands/fibaro.png b/source/images/supported_brands/fibaro.png
new file mode 100644
index 00000000000..438b2087d03
Binary files /dev/null and b/source/images/supported_brands/fibaro.png differ