diff --git a/source/_components/sensor.zabbix.markdown b/source/_components/sensor.zabbix.markdown
deleted file mode 100644
index bb5b3118114..00000000000
--- a/source/_components/sensor.zabbix.markdown
+++ /dev/null
@@ -1,53 +0,0 @@
----
-layout: page
-title: "Zabbix Sensor"
-description: "Instructions on how to integrate Zabbix Triggers sensors within Home Assistant."
-date: 2016-12-13 22:57
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zabbix.png
-ha_category: System Monitor
-ha_release: 0.37
-ha_iot_class: Local Polling
----
-
-The `zabbix` sensor platform let you monitor the current count of active triggers for your [Zabbix](http://www.zabbix.com/) monitoring instance.
-
-<p class='note'>
-You must have the [Zabbix component](/components/zabbix/) configured to use those sensors.
-</p>
-
-## {% linkable_title Configuration %}
-
-To set it up, add the following information to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: zabbix
-    triggers:
-      name: Important Hosts Trigger Count
-      hostids: [10051,10081,10084]
-      individual: true
-```
-
-{% configuration %}
-triggers:
-  description: Specifies that this sensor is for Zabbix 'triggers'. In the future there will be other Zabbix sensors.
-  required: true
-  type: string
-name:
-  description: Allows you to specify the name for the Sensor, otherwise the host name, as stored in Zabbix, is used.  This is useful when you are specifying a list of hostids to monitor as a single count.
-  required: false
-  type: string
-hostids:
-  description: This is a list of Zabbix hostids that we want to filter our count on.
-  required: false
-  type: string
-individual:
-  description: A 'true'/'false' to specify whether we should show individual sensors when a list of hostids is provided.  If false, the sensor state will be the count of all triggers for the specified hosts (or all hosts within the Zabbix instance, if hostids isn't provided).
-  required: false
-  type: boolean
-{% endconfiguration %}
diff --git a/source/_components/zabbix.markdown b/source/_components/zabbix.markdown
index 75fce8fe3d7..e68b2841c6b 100644
--- a/source/_components/zabbix.markdown
+++ b/source/_components/zabbix.markdown
@@ -8,13 +8,21 @@ comments: false
 sharing: true
 footer: true
 logo: zabbix.png
-ha_category: System Monitor
+ha_category:
+  - System Monitor
+  - Sensor
 ha_release: 0.37
 ha_iot_class: Local Polling
+redirect_from:
+  - /components/sensor.zabbix/
 ---
 
 The `zabbix` component is the main component to connect to a [Zabbix](http://www.zabbix.com/) monitoring instance via the Zabbix API.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+
 ## {% linkable_title Configuration %}
 
 To set the Zabbix component up, add the following information to your `configuration.yaml` file:
@@ -22,7 +30,7 @@ To set the Zabbix component up, add the following information to your `configura
 ```yaml
 # Example configuration.yaml entry
 zabbix:
-  host: 192.168.0.100
+  host: IP_ADDRESS
 ```
 
 {% configuration %}
@@ -61,3 +69,42 @@ zabbix:
   username: USERNAME
   password: PASSWORD
 ```
+
+## {% linkable_title Sensor %}
+
+The `zabbix` sensor platform let you monitor the current count of active triggers for your [Zabbix](http://www.zabbix.com/) monitoring instance.
+
+<p class='note'>
+You must have the <a href="#configuration">Zabbix component</a> 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: zabbix
+    triggers:
+      name: Important Hosts Trigger Count
+      hostids: [10051,10081,10084]
+      individual: true
+```
+
+{% configuration %}
+triggers:
+  description: Specifies that this sensor is for Zabbix 'triggers'. In the future there will be other Zabbix sensors.
+  required: true
+  type: string
+name:
+  description: Allows you to specify the name for the Sensor, otherwise the host name, as stored in Zabbix, is used. This is useful when you are specifying a list of hostids to monitor as a single count.
+  required: false
+  type: string
+hostids:
+  description: This is a list of Zabbix hostids that we want to filter our count on.
+  required: false
+  type: string
+individual:
+  description: A 'true'/'false' to specify whether we should show individual sensors when a list of hostids is provided. If false, the sensor state will be the count of all triggers for the specified hosts (or all hosts within the Zabbix instance, if hostids isn't provided).
+  required: false
+  type: boolean
+{% endconfiguration %}
\ No newline at end of file