diff --git a/source/_components/light.qwikswitch.markdown b/source/_components/light.qwikswitch.markdown
new file mode 100644
index 00000000000..639f681a7ee
--- /dev/null
+++ b/source/_components/light.qwikswitch.markdown
@@ -0,0 +1,22 @@
+---
+layout: page
+title: "QwikSwitch Lights"
+description: "Instructions how to integrate Qwikswitch Dimemrs and Relays as lights into Home Assistant."
+date: 2016-05-04 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: qwikswitch.png
+ha_category: Light
+ha_iot_class: "Local Push"
+ha_release: 0.19
+---
+
+
+The `qwikswitch` platform allows you to control your [QwikSwitch](http://www.qwikswitch.co.za/) Relays and Dimmers as lights from within Home Assistant.
+
+They will be automatically discovered if the discovery component is enabled.
+
+For more configuration information see the [QwikSwitch component](/components/qwikswitch/) documentation.
+
diff --git a/source/_components/qwikswitch.markdown b/source/_components/qwikswitch.markdown
new file mode 100644
index 00000000000..d1456dd9bcf
--- /dev/null
+++ b/source/_components/qwikswitch.markdown
@@ -0,0 +1,49 @@
+---
+layout: page
+title: "QwikSwitch QSUSB Hub"
+description: "Instructions how to integrate the QwikSwitch QSUSB Hub into Home Assistant."
+date: 2016-05-04 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: qwikswitch.png
+ha_category: Hub
+featured: true
+---
+
+
+The `qwikswitch` component is the main component to integrate various [QwikSwitch](http://www.qwikswitch.co.za/) devices with Home Assistant.
+
+Loading the `qwikswitch` component will automatically add all devices from the QS Mobile application. QS Mobile controls the QSUSB Modem device.
+
+Currently QwikSwitch Relays and LED Dimmers are supported (tested). QwikSwitch Relay devices can be Switches or [Lights](/components/qwikswitch/lights/) in Home-Assistant. If the device name in the QSUSB app ends with ` Switch` it will be created as a Switch, otherwise a Light.
+
+Example configuration:
+
+```yaml
+# Example configuration.yaml entry
+qwikswitch:
+   url: 'http://127.0.0.1:2020'
+```
+
+{% linkable_title QwikSwitch Buttons %}
+
+QwikSwitch devices (i.e. Tranmitter Buttons) will fire events on the Home Assistant bus. These events can then be used as triggers for any `automation` action, as follows:
+
+```yaml
+automation:
+  - alias: Action - Respond to button press
+    trigger:
+      platform: event
+      event_type: qwikswitch.button.@12df34
+```
+
+`event_type` names should be in the format **qwikswitch.button.@__ID__**. where **@__ID__** will be captured in the Home Assistant log when pressing the button. Alternatively, you can also access the listen API call by going to 'http://127.0.0.1:2020/&listen' and then pressing the button.
+
+Currently Event will be created for the following commands (cmd) value in the Listen packet:
+- `TOGGLE` - Normal QwikSwitch Transmitter button
+- `SCENE EXE` - QwikSwitch Scene Transmitter buttons
+- `LEVEL` - QwikSwitch OFF Tranmitter buttons
+
+Technically this could work for Keyfobs, Door Sensors and PIR Tranmitters as well.
diff --git a/source/_components/switch.qwikswitch.markdown b/source/_components/switch.qwikswitch.markdown
new file mode 100644
index 00000000000..bdacbc2e827
--- /dev/null
+++ b/source/_components/switch.qwikswitch.markdown
@@ -0,0 +1,23 @@
+---
+layout: page
+title: "QwikSwitch Switch"
+description: "Instructions how to integrate QwikSwitch Relays into Home Assistant."
+date: 2016-05-04 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: qwikswitch.png
+ha_category: Switch
+ha_iot_class: "Local Push"
+ha_release: 0.19
+---
+
+
+The `qwikswitch` platform allows you to control your [QwikSwitch](http://www.qwikswitch.co.za/) Relays as Switches from within Home Assistant.
+
+QwikSwitch Relay devices can be Switches or [Lights](/components/qwikswitch/lights/) in Home-Assistant. If the device name in the QSUSB app ends with ` Switch` it will be created as a Switch, otherwise a Light.
+
+They will be automatically discovered from the QSUSB API if the discovery component is enabled.
+
+For more configuration information see the [QwikSwitch component](/components/qwikswitch/) documentation.
diff --git a/source/images/supported_brands/qwikswitch.png b/source/images/supported_brands/qwikswitch.png
new file mode 100644
index 00000000000..f9f7a4ecd28
Binary files /dev/null and b/source/images/supported_brands/qwikswitch.png differ