diff --git a/source/_components/switch.netio.markdown b/source/_components/switch.netio.markdown
new file mode 100644
index 00000000000..b30efab2212
--- /dev/null
+++ b/source/_components/switch.netio.markdown
@@ -0,0 +1,112 @@
+---
+layout: page
+title: "Netio Switch"
+description: "Instructions how to integrate Netio switches into Home Assistant."
+date: 2016-09-02 19:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: netio.png
+ha_category: Switch
+ha_iot_class: "Local Polling"
+ha_release: 0.24
+---
+
+
+The `netio` switch platform allows you to control your [Netio](http://www.netio-products.com/en/overview/) Netio4, Netio4 All, and Netio 230B. These are smart outlets controllable through ethernet and/or WiFi that reports consumptions (Netio4all).
+
+To use Netio devices in your installation, add the following to your `configuration.yaml` file:
+
+```
+# Example configuration.yaml entry
+switch:
+  - platform: netio
+    host: 192.168.1.43
+    port: 1234
+    username: user
+    password: pwd
+    outlets:
+      1: Free
+      2: TV
+      4: Lamp
+```
+
+Configuration variables:
+
+- **host** (*Required*): The IP address of your Netio plug, eg. http://192.168.1.32
+- **port** (*Optional*): The port to communicate with the switch. Defaults to `1234`.
+- **username** (*Required*): The username for your plug.
+- **password** (*Required*): The password for your plug.
+- **outlets** (*Required*) array: List of all outlets.
+  - **[No.]: [Name]** (*Required*): Identification of an outlet.
+
+
+
+To get pushed updates from the Netio devices, one can add this Lua code in the device interface as an action triggered on "Netio" "System variables updated"
+with an 'Always' schedule:
+
+
+```lua
+-- this will send socket and consumption status updates via CGI
+-- to given address. Associate with 'System variables update' event
+-- to get consumption updates when they show up
+
+local address='ha:8123'
+local path = '/api/netio/<host>'
+
+
+local output = {}
+for i = 1, 4 do for _, what in pairs({'state', 'consumption',
+                        'cumulatedConsumption', 'consumptionStart'}) do
+    local varname = string.format('output%d_%s', i, what)
+    table.insert(output,
+        varname..'='..tostring(devices.system[varname]):gsub(" ","|"))
+end end
+
+local qs = table.concat(output, '&')
+local url = string.format('http://%s%s?%s', address, path, qs)
+devices.system.CustomCGI{url=url}
+```
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+The `dlink` switch platform allows you to control the state of your [D-Link Wi-Fi Smart Plugs](http://us.dlink.com/product-category/home-solutions/connected-home/smart-plugs/).
+
+Supported devices (tested):
+
+- DSP-W215
+- DSP-W110
+
+To use your D-Link smart plugs in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  platform: dlink
+  host: IP_ADRRESS
+  name: D-Link plug
+  username: YOUR_USERNAME
+  password: YOUR_PASSWORD
+```
+
+
+
diff --git a/source/images/supported_brands/netio.png b/source/images/supported_brands/netio.png
new file mode 100644
index 00000000000..1cd239537b2
Binary files /dev/null and b/source/images/supported_brands/netio.png differ