diff --git a/source/_components/sensor.zoneminder.markdown b/source/_components/sensor.zoneminder.markdown
new file mode 100644
index 00000000000..8be4611b477
--- /dev/null
+++ b/source/_components/sensor.zoneminder.markdown
@@ -0,0 +1,27 @@
+---
+layout: page
+title: "ZoneMinder Sensor"
+description: "Instructions how to integrate ZoneMinder sensors within Home Assistant."
+date: 2016-10-13 22:57
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zoneminder.png
+ha_category: Sensor
+---
+
+
+The `ZoneMinder` sensor platform let you monitor the current state of your zoneminder install including the number of events and the current state of the cameras.
+
+<p class='note'>
+You must have the [ZoneMinder component](/components/zoneminder/) configured to use those sensors.
+</p>
+
+To set it up, add the following information to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: zoneminder
+```
\ No newline at end of file
diff --git a/source/_components/switch.zoneminder.markdown b/source/_components/switch.zoneminder.markdown
new file mode 100644
index 00000000000..fa757bf2d9f
--- /dev/null
+++ b/source/_components/switch.zoneminder.markdown
@@ -0,0 +1,40 @@
+---
+layout: page
+title: "ZoneMinder Switch"
+description: "Instructions how to integrate ZoneMinder switches into Home Assistant."
+date: 2016-10-13 22:57
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zoneminder.png
+ha_category: Switch
+---
+
+
+The `zoneminder` switch platform allows you to toggle the current function of cameras attached to your ZoneMinder instance.
+
+<p class='note'>
+You must have the [ZoneMinder component](/components/zoneminder/) configured to use this.
+</p>
+
+To enable this switch, add the following lines to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: zoneminder
+    command_on: Modect
+    command_off: Monitor
+```
+
+Configuration variables:
+
+- **command_on** (*Required*): The function you want the camera to run when turned on.
+- **command_off** (*Required*): The function you want the camera to run when turned off.
+
+
+<p class='note'>
+The default functions installed by ZoneMinder are: None, Monitor, Modect, Record, Mocord, Nodect.
+</p>
+
diff --git a/source/_components/zoneminder.markdown b/source/_components/zoneminder.markdown
new file mode 100644
index 00000000000..32aa596c8d4
--- /dev/null
+++ b/source/_components/zoneminder.markdown
@@ -0,0 +1,31 @@
+---
+layout: page
+title: "ZoneMinder"
+description: "Instructions how to integrate ZoneMinder into Home Assistant."
+date: 2016-10-13 22:57
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: zoneminder.png
+ha_category: Camera
+featured: false
+---
+
+The ZoneMinder component is the main component to integrate all the sensors and switches for controlling your ZoneMinder instance.
+
+```yaml
+# Example configuration.yaml entry
+zoneminder:
+  host: ZM_HOST
+  path: ZM_PATH
+  username: USERNAME
+  password: PASSWORD
+```
+
+Configuration variables:
+- **host** (*Required*): Your ZoneMinder server.
+- **path** (*Optional*): Path to your ZoneMinder install (default: /zm/)
+- **username** (*Optional*): Your ZoneMinder username.
+- **password** (*Optional*): Your ZoneMinder password.
+
diff --git a/source/images/supported_brands/zoneminder.png b/source/images/supported_brands/zoneminder.png
new file mode 100644
index 00000000000..0fefee67988
Binary files /dev/null and b/source/images/supported_brands/zoneminder.png differ