diff --git a/source/_components/hvac.markdown b/source/_components/hvac.markdown
new file mode 100644
index 00000000000..51092629ab5
--- /dev/null
+++ b/source/_components/hvac.markdown
@@ -0,0 +1,22 @@
+---
+layout: page
+title: "HVAC"
+description: "Instructions on how to integrate HVAC devices status with Home Assistant."
+date: 2016-05-07 09:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: HVAC
+ha_release: 0.19
+---
+
+The `hvac` component is built for the controlling and monitoring of HVAC (heating, ventilating, and air conditioning) devices.
+ 
+To enable this component, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+hvac:
+```
+
diff --git a/source/_components/hvac.zwave.markdown b/source/_components/hvac.zwave.markdown
new file mode 100644
index 00000000000..8cb94120226
--- /dev/null
+++ b/source/_components/hvac.zwave.markdown
@@ -0,0 +1,15 @@
+---
+layout: page
+title: "Z-Wave HVAC"
+description: "Instructions on how to integrate HVAC Z-Wave devices status with Home Assistant."
+date: 2016-05-07 09:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: z-wave.png
+ha_category: HVAC
+ha_release: 0.19
+---
+ 
+To get your Z-Wave `hvac` devices working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/) and the (HVAC component](/components/hvac/).