diff --git a/fritzbox_wifi_devices.py b/fritzbox_wifi_devices.py
new file mode 100755
index 0000000..3ae44a3
--- /dev/null
+++ b/fritzbox_wifi_devices.py
@@ -0,0 +1,70 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+  fritzbox_wifi_devices - A munin plugin for Linux to monitor AVM Fritzbox
+  Copyright (C) 2015 Christian Stade-Schuldt
+  Author: Christian Stade-Schuldt
+  Like Munin, this plugin is licensed under the GNU GPL v2 license
+  http://www.opensource.org/licenses/GPL-2.0
+  If you've put your gunicorn pid somewhere other than the
+  default /var/run/gunicorn.pid, you can add a section like
+  this to your munin-node's plugin configuration:
+
+  [fritzbox_*]
+  env.fritzbox_ip [ip address of the fritzbox]
+  env.password [fritzbox password]
+  This plugin supports the following munin configuration parameters:
+  #%# family=auto contrib
+  #%# capabilities=autoconf
+"""
+
+import hashlib
+import httplib
+import os
+import re
+import sys
+import fritzbox_helper as fh
+from io import StringIO, BytesIO
+
+PAGE = '/system/energy.lua'
+pattern = re.compile('(\d+) WLAN')
+
+
+def get_connected_wifi_devices():
+    """gets the numbrer of currently connected wifi devices"""
+
+    server = os.environ['fritzbox_ip']
+    password = os.environ['fritzbox_password']
+
+    sid = fh.get_sid(server, password)
+    data = fh.get_page(server, sid, PAGE)
+    m = re.search(pattern, data)
+    if m:
+        connected_devices = int(m.group(1))
+        print 'wifi.value %d' % connected_devices
+
+
+def print_config():
+    print 'graph_title AVM Fritz!Box Connected Wifi Devices'
+    print 'graph_vlabel Number of devices'
+    print 'graph_args --base 1000'
+    print 'graph_category network'
+    print 'graph_order wifi'
+    print 'wifi.label Wifi Connections on 2.4 & 5 Ghz'
+    print 'wifi.type GAUGE'
+    print 'wifi.graph LINE1'
+    print 'wifi.info Wifi Connections on 2.4 & 5 Ghz'
+
+
+if __name__ == '__main__':
+    if len(sys.argv) == 2 and sys.argv[1] == 'config':
+        print_config()
+    elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
+        print 'yes'
+    elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
+    # Some docs say it'll be called with fetch, some say no arg at all
+        try:
+            get_connected_wifi_devices()
+        except:
+            sys.exit("Couldn't retrieve connected fritzbox wifi devices")