diff --git a/html/images/os/ruckus.png b/html/images/os/ruckus.png
new file mode 100644
index 000000000..b127ecc6c
Binary files /dev/null and b/html/images/os/ruckus.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 0f66209f9..4e279358d 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -357,6 +357,15 @@ $config['os'][$os]['text']              = "ZTE ZXR10";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "zte";
 
+// Ruckus Wireless
+
+$os = "ruckuswireless";
+$config['os'][$os]['text']              = "Ruckus Wireless";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "ruckus";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Traffic";
+
 // Supermicro Switch
 
 $os = "supermicro-switch";
diff --git a/includes/discovery/os/ruckuswireless.inc.php b/includes/discovery/os/ruckuswireless.inc.php
new file mode 100644
index 000000000..dff998273
--- /dev/null
+++ b/includes/discovery/os/ruckuswireless.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+* LibreNMS Ruckus Wireless OS information module
+*
+* Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation, either version 3 of the License, or (at your
+* option) any later version.  Please see LICENSE.txt at the top level of
+* the source code distribution for details.
+*/
+if (!$os) {
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.25053.3.1.4")) {
+        $os = "ruckuswireless";
+    }
+}
+?>
diff --git a/includes/polling/os/ruckuswireless.inc.php b/includes/polling/os/ruckuswireless.inc.php
new file mode 100644
index 000000000..88a94c2a9
--- /dev/null
+++ b/includes/polling/os/ruckuswireless.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+* LibreNMS Ruckus Wireless OS information module
+*
+* Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+* This program is free software: you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation, either version 3 of the License, or (at your
+* option) any later version.  Please see LICENSE.txt at the top level of
+* the source code distribution for details.
+*/
+$hardware = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.2.1.1.1.1.0", "-Ovq") , '" ');
+$version = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.3.1.1.1.1.1.3.1", "-Ovq") , '" ');
+$serial = trim(snmp_get($device, ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0", "-Ovq") , '" ');
+?>