diff --git a/source/_components/mfi.markdown b/source/_components/mfi.markdown
index d0ab347786e..14f568bafa6 100644
--- a/source/_components/mfi.markdown
+++ b/source/_components/mfi.markdown
@@ -1,23 +1,77 @@
 ---
 layout: page
-title: "mFi Switch"
-description: "Instructions on how to integrate mFi switches within Home Assistant."
+title: "mFi"
+description: "Instructions on how to integrate mFi within Home Assistant."
 date: 2016-02-07 10:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
 logo: ubiquiti.png
-ha_category: Switch
+ha_category:
+  - Network
+  - Sensor
+  - Switch
 ha_iot_class: Local Polling
 ha_release: 0.13
 redirect_from:
  - /components/switch.mfi/
+ - /components/sensor.mfi/
 ---
 
-The `mfi` switch platform to allow you to control [mFi Controllable Power Outlets](https://www.ubnt.com/mfi/mpower/).
+There is currently support for the following device types within Home Assistant:
 
-## {% linkable_title Configuration %}
+- [Sensor](#sensor)
+- [Switch](#switch)
+
+## {% linkable_title Sensor %}
+
+The `mfi` sensor platform to allow you to monitor [mFi mPort interface and sensors](https://www.ubnt.com/mfi/mport/).
+
+To add this platform to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: mfi
+    host: IP_ADDRESS_OF_SENSOR
+    username: YOUR_USERNAME
+    password: YOUR_PASSWORD
+```
+
+{% configuration %}
+host:
+  description: The IP address or hostname of your mFi controller.
+  required: true
+  type: string
+port:
+  description: The port of your mFi controller.
+  required: false
+  default: 6080 (6443 for TLS)
+  type: integer
+username:
+  description: The mFi admin username.
+  required: true
+  type: string
+password:
+  description: The mFi admin user's password.
+  required: true
+  type: string
+ssl:
+  description: If `true`, use SSL/TLS to contact the mFi controller.
+  required: false
+  default: true
+  type: boolean
+verify_ssl:
+  description: Set this to `false` if your mFi controller has a self-signed certificate.
+  required: false
+  default: true
+  type: boolean
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+The `mfi` switch platform to allow you to control [mFi Controllable Power Outlets](https://www.ubnt.com/mfi/mpower/).
 
 To add this platform to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.mfi.markdown b/source/_components/sensor.mfi.markdown
deleted file mode 100644
index 8d1d4628c51..00000000000
--- a/source/_components/sensor.mfi.markdown
+++ /dev/null
@@ -1,59 +0,0 @@
----
-layout: page
-title: "mFi Sensor"
-description: "Instructions on how to integrate mFi sensors within Home Assistant."
-date: 2016-02-07 10:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: ubiquiti.png
-ha_category: Network
-ha_iot_class: Local Polling
-ha_release: 0.32
----
-
-The `mfi` sensor platform to allow you to monitor [mFi mPort interface and sensors](https://www.ubnt.com/mfi/mport/).
-
-## {% linkable_title Configuration %}
-
-To add this platform to your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: mfi
-    host: IP_ADDRESS_OF_SENSOR
-    username: YOUR_USERNAME
-    password: YOUR_PASSWORD
-```
-
-{% configuration %}
-host:
-  description: The IP address or hostname of your mFi controller.
-  required: true
-  type: string
-port:
-  description: The port of your mFi controller.
-  required: false
-  default: 6080 (6443 for TLS)
-  type: integer
-username:
-  description: The mFi admin username.
-  required: true
-  type: string
-password:
-  description: The mFi admin user's password.
-  required: true
-  type: string
-ssl:
-  description: If `true`, use SSL/TLS to contact the mFi controller.
-  required: false
-  default: true
-  type: boolean
-verify_ssl:
-  description: Set this to `false` if your mFi controller has a self-signed certificate.
-  required: false
-  default: true
-  type: boolean
-{% endconfiguration %}