diff --git a/includes/discovery/fanspeeds/extreme.inc.php b/includes/discovery/fanspeeds/extreme.inc.php
new file mode 100644
index 0000000000..c9f99d38bc
--- /dev/null
+++ b/includes/discovery/fanspeeds/extreme.inc.php
@@ -0,0 +1,29 @@
+<?php
+
+if ($device['os'] == 'xos') {
+    echo(" EXTREME-BASE-MIB ");
+
+    // Fan Speed
+    $oid = "1.3.6.1.4.1.1916.1.1.1.9.1.4";
+    $oids = snmpwalk_cache_multi_oid($device, $oid, array(), "EXTREME-BASE-MIB");
+
+    foreach ($oids as $index => $entry) {
+	// fix index to a proper int
+        preg_match('/^.*\.([^\.]*)$/', "$index", $matches);
+        $index = $matches[1];
+        // substract 100 from index to start from 1 instead of 101
+        $modindex = ($index - 100);
+        $oid	= "1.3.6.1.4.1.1916.1.1.1.9.1.4.$index";
+        $value	= snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+        $descr	= "Fan Speed $modindex";
+        $high_limit		= ($value * 1.5);
+        $high_warn_limit	= ($value * 1.25);
+        $low_warn_limit		= ($value * 0.75);
+        $low_limit		= ($value * 0.5);
+        if (is_numeric($value)) {
+            discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'extreme-fanspeed', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
+        }
+    }
+}
+
+// EOF