diff --git a/source/_components/camera.uvc.markdown b/source/_components/camera.uvc.markdown
new file mode 100644
index 00000000000..9e76fa421f0
--- /dev/null
+++ b/source/_components/camera.uvc.markdown
@@ -0,0 +1,33 @@
+---
+layout: component
+title: "UniFi Video Camera"
+description: "Instructions how to integrate UVC cameras within Home Assistant."
+date: 2016-02-07 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ubiquiti.png
+ha_category: Camera
+---
+
+
+The `uvc` component allows you to integrate [UniFi Video Camera (UVC)](https://www.ubnt.com/unifi-video/unifi-video-camera/) into Home Assistant.
+
+To enable a UVC camera in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  platform: uvc
+  nvr: IP_ADDRESS
+  port: PORT
+  key: APIKEY
+```
+
+Configuration variables:
+
+- **nvr** *Optional*: The IP or hostname of the NVR (Network Video Recorder) server.
+- **port** *Optional*: The port number to use for accessing the NVR.
+- **key** *Required*: The API key available from the NVR web interface.
+
diff --git a/source/_components/sensor.mfi.markdown b/source/_components/sensor.mfi.markdown
new file mode 100644
index 00000000000..7eeaf2517c3
--- /dev/null
+++ b/source/_components/sensor.mfi.markdown
@@ -0,0 +1,35 @@
+---
+layout: component
+title: "mFi Sensor"
+description: "Instructions 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: 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
+  port: PORT
+  username: USERNAME
+  password: PASSWORD
+```
+
+Configuration variables:
+
+- **host** (*Required*): The IP address or hostname of your mFi controller.
+- **port** (*Optional*): The port of your mFi controller. Defaults to 6443.
+- **username** (*Required*): The mFi admin username.
+- **password** (*Required*): The mFi admin user's password.
+
diff --git a/source/_components/switch.mfi.markdown b/source/_components/switch.mfi.markdown
new file mode 100644
index 00000000000..a67385b7cba
--- /dev/null
+++ b/source/_components/switch.mfi.markdown
@@ -0,0 +1,35 @@
+---
+layout: component
+title: "mFi Switch"
+description: "Instructions how to integrate mFi switches within Home Assistant."
+date: 2016-02-07 10:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ubiquiti.png
+ha_category: 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:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: mfi
+  host: IP_ADDRESS
+  port: PORT
+  username: USERNAME
+  password: PASSWORD
+```
+
+Configuration variables:
+
+- **host** (*Required*): The IP address or hostname of your mFi controller.
+- **port** (*Optional*): The port of your mFi controller. Defaults to 6443.
+- **username** (*Required*): The mFi admin username.
+- **password** (*Required*): The mFi admin user's password.
+
diff --git a/source/images/supported_brands/ubiquiti.png b/source/images/supported_brands/ubiquiti.png
new file mode 100644
index 00000000000..363b4a617ae
Binary files /dev/null and b/source/images/supported_brands/ubiquiti.png differ