diff --git a/AUTHORS.md b/AUTHORS.md
index 5150a6d0d..0a67718ba 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -39,6 +39,7 @@ Contributors to LibreNMS:
 - Travis Hegner <travis.hegner@gmail.com> (travishegner)
 - Will Jones <email@willjones.eu> (willjones)
 - Job Snijders <job@instituut.net> (job)
+- Rasmus Aberg <rasmus@sthix.net> (rasssta)
 
 [1]: http://observium.org/ "Observium web site"
 
diff --git a/includes/discovery/power/extreme.inc.php b/includes/discovery/power/extreme.inc.php
new file mode 100644
index 000000000..39c9ca352
--- /dev/null
+++ b/includes/discovery/power/extreme.inc.php
@@ -0,0 +1,16 @@
+<?php
+
+echo(" EXTREME-BASE-MIB ");
+
+// Power Usage
+$descr   = "Power Usage";
+$oid     = "1.3.6.1.4.1.1916.1.1.1.40.1.0"; // extremeSystemPowerUsage
+$value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+$divisor = "1000";
+$value	 = ($value / $divisor); // Nasty hack to divide the first value by 1000 since the divisor only works for polling after the sensor has been added
+
+if (is_numeric($value)) {
+    discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts
+}
+
+// EOF
diff --git a/includes/discovery/temperatures/extreme.inc.php b/includes/discovery/temperatures/extreme.inc.php
new file mode 100644
index 000000000..ae1cf86b1
--- /dev/null
+++ b/includes/discovery/temperatures/extreme.inc.php
@@ -0,0 +1,21 @@
+<?php
+
+if ($device['os'] == 'xos') {
+    echo(" EXTREME-BASE-MIB ");
+
+    // Chassis temperature
+    $high_limit		= 65;
+    $high_warn_limit	= 55;
+    $low_warn_limit		= 15;
+    $low_limit		= 5;
+
+    $descr   = "Chassis Temperature";
+    $oid     = "1.3.6.1.4.1.1916.1.1.1.8.0"; // extremeCurrentTemperature
+    $value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+
+    if (is_numeric($value)) {
+        discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
+    }
+}
+
+// EOF