diff --git a/source/components/device_tracker.markdown b/source/components/device_tracker.markdown
index 78004ea3307..544312e23cc 100644
--- a/source/components/device_tracker.markdown
+++ b/source/components/device_tracker.markdown
@@ -9,7 +9,7 @@ sharing: true
 footer: true
 ---
 
-Home Assistant can get information from your wireless router to track which devices are connected. There are three different types of supported wireless routers:
+Home Assistant can get information from your wireless router to track which devices are connected. There are several brands of supported wireless routers:
 
 - [Actiontec](/components/device_tracker.actiontec.html)
 - [Aruba](/components/device_tracker.aruba.html)
@@ -20,6 +20,7 @@ Home Assistant can get information from your wireless router to track which devi
 - [Thomson](/components/device_tracker.thomson.html)
 - [tomato](/components/device_tracker.tomato.html)
 - [TP-Link](/components/device_tracker.tplink.html)
+- [Generic SNMP](/components/device_tracker.snmp.html)
 
 Alternative trackers:
 
diff --git a/source/components/device_tracker.snmp.markdown b/source/components/device_tracker.snmp.markdown
new file mode 100644
index 00000000000..0bd6c7a345e
--- /dev/null
+++ b/source/components/device_tracker.snmp.markdown
@@ -0,0 +1,37 @@
+---
+layout: page
+title: "Generic SNMP support"
+description: "Instructions how to integrate SNMP into Home Assistant."
+date: 2015-10-08 12:00
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+<img src='/images/supported_brands/network-snmp.png' class='brand pull-right' />
+Most wifi-accesspoints (WAP) and wifi-routers (WRT) support the Simple Network Management Protocol (SNMP).
+This is a standardized method for monitoring/manageing network connected devices. SNMP uses a tree-like
+hierarchy where each node is an object. Many of these objects contain (live) lists of insances and metrics,
+like network interfaces, disks, and wifi registrations.
+
+This component uses python-pysnmp.
+
+```yaml
+# Example configuration.yaml entry
+device_tracker:
+  platform: snmp
+  hosts: 192.168.1.1
+  community: public
+  baseoid: 1.3.6.1.4.1.14988.1.1.1.2.1.1
+```
+
+`community` is the SNMP community which is configured in the WAP/WRT. Most devices have a default
+community set to to `public` with read-only permission (which is sufficient). This parameter is mandatory
+
+`baseoid` is the OID prefix where wireless client registrations can be found, usually vendor specific.
+It's advised to use the numerical notation. To find this base OID, check vendor documentation or check
+the MIB file for your device.
+
+See the [device tracker component page](/components/device_tracker.html) for instructions how to
+configure the people to be tracked.
diff --git a/source/components/index.markdown b/source/components/index.markdown
index e4aadcaa32b..e9c84f08693 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -216,6 +216,11 @@ Entities are things that you want to observe within Home Assistant. Support for
   <td><a href='/components/device_tracker.nmap_scanner.html'>NMap network scanning</a></td>
 </tr>
 
+<tr>
+  <td><a href='/components/device_tracker.snmp.html'><img src='/images/supported_brands/network-snmp.png' class='brand overview' /></a></td>
+  <td><a href='/components/device_tracker.snmp.html'>SNMP capable devices</a></td>
+</tr>
+
 </table>
 
         </div>
diff --git a/source/images/supported_brands/network-snmp.png b/source/images/supported_brands/network-snmp.png
new file mode 100644
index 00000000000..d48e8dec4f4
Binary files /dev/null and b/source/images/supported_brands/network-snmp.png differ