diff --git a/source/_components/binary_sensor.zha.markdown b/source/_components/binary_sensor.zha.markdown
new file mode 100644
index 00000000000..c976c2fb698
--- /dev/null
+++ b/source/_components/binary_sensor.zha.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "ZigBee Home Automation Binary Sensor"
+description: "Instructions how to setup ZigBee Home Automation binary sensors within Home Assistant."
+date: 2017-02-22 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zigbee.png
+ha_category: Binary Sensor
+---
+
+To get your ZigBee binary sensors working with Home Assistant, follow the
+instructions for the general [ZigBee Home Automation
+component](/components/zha/).
diff --git a/source/_components/light.zha.markdown b/source/_components/light.zha.markdown
new file mode 100644
index 00000000000..fe71e06fc07
--- /dev/null
+++ b/source/_components/light.zha.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "ZigBee Home Automation Light"
+description: "Instructions how to setup ZigBee Home Automation lights within Home Assistant."
+date: 2017-02-22 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zigbee.png
+ha_category: Light
+---
+
+To get your ZigBee lights working with Home Assistant, follow the
+instructions for the general [ZigBee Home Automation
+component](/components/zha/).
diff --git a/source/_components/sensor.zha.markdown b/source/_components/sensor.zha.markdown
new file mode 100644
index 00000000000..75f0655db4e
--- /dev/null
+++ b/source/_components/sensor.zha.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "ZigBee Home Automation Sensor"
+description: "Instructions how to setup ZigBee Home Automation sensors within Home Assistant."
+date: 2017-02-22 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zigbee.png
+ha_category: Sensor
+---
+
+To get your ZigBee sensors working with Home Assistant, follow the
+instructions for the general [ZigBee Home Automation
+component](/components/zha/).
diff --git a/source/_components/switch.zha.markdown b/source/_components/switch.zha.markdown
new file mode 100644
index 00000000000..e730624d63c
--- /dev/null
+++ b/source/_components/switch.zha.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "ZigBee Home Automation Switch"
+description: "Instructions how to setup ZigBee Home Automation switches within Home Assistant."
+date: 2017-02-22 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zigbee.png
+ha_category: Switch
+---
+
+To get your ZigBee switches working with Home Assistant, follow the
+instructions for the general [ZigBee Home Automation
+component](/components/zha/).
diff --git a/source/_components/zha.markdown b/source/_components/zha.markdown
new file mode 100644
index 00000000000..46fd0c96a26
--- /dev/null
+++ b/source/_components/zha.markdown
@@ -0,0 +1,47 @@
+---
+layout: page
+title: "Zigbee Home Automation"
+description: "Instructions how to integrate your Zigbee Home Automation within Home Assistant."
+date: 2017-02-22 19:59
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zigbee.png
+ha_category: Hub
+ha_release: 0.39
+---
+
+[ZigBee Home Automation](http://www.zigbee.org/zigbee-for-developers/applicationstandards/zigbeehomeautomation/)
+integration for Home Assistant allows you to connect many off-the-shelf ZigBee
+devices to Home Assistant, using a compatible ZigBee radio.
+
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](../binary_sensor.zha) (e.g. motion and door sensors)
+- [Sensor](../sensor.zha) (e.g. temperature sensors)
+- [Light](../light.zha)
+- [Switch](../switch.zha)
+
+Known working ZigBee radios:
+
+- Nortek/GoControl Z-Wave & Zigbee USB Adaptor - Model HUSBZB-1
+
+To configure the component, a `zha` section must be present in the `configuration.yaml`,
+and the path to the serial device for the radio and path to the database which will persist your network data is required.
+
+```yaml
+# Example configuration.yaml entry
+zha:
+  usb_path: /dev/ttyUSB2
+  database_path: zigbee.db
+```
+
+Configuration variables:
+
+ - **usb_path** (*Required*): Path to the serial device for the radio.
+ - **database_path** (*Required*): Path to the database which will keep persisten newtork data.
+
+
+
+To add new devices to the network, call the `permit` service on the `zha` domain, and then follow the device instructions.