diff --git a/includes/discovery/fanspeeds/drac.inc.php b/includes/discovery/fanspeeds/drac.inc.php
new file mode 100644
index 000000000..7c96b35b5
--- /dev/null
+++ b/includes/discovery/fanspeeds/drac.inc.php
@@ -0,0 +1,29 @@
+<?php
+
+if ($device['os'] == "drac") {
+    $oids = snmp_walk($device, "coolingDevicechassisIndex.1", "-OsqnU", "IDRAC-MIB-SMIv2");
+    if ($debug) {
+        echo($oids."\n");
+    }
+    $oids = trim($oids);
+    if ($oids) {
+        echo("Dell iDRAC");
+    }
+    foreach (explode("\n", $oids) as $data) {
+        $data = trim($data);
+        if ($data) {
+            list($oid,$kind) = explode(" ", $data);
+            $split_oid = explode('.',$oid);
+            $index = $split_oid[count($split_oid)-1];
+            $fan_oid       = ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.$index";
+            $descr_oid     = "coolingDeviceLocationName.1.$index";
+            $limit_oid     = "coolingDeviceLowerCriticalThreshold.1.$index";
+            $descr         = trim(snmp_get($device, $descr_oid, "-Oqv", "IDRAC-MIB-SMIv2"),'"');
+            $descr         = preg_replace("/(Board | MOD )/","", $descr);
+            $current       = snmp_get($device, $fan_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+            $low_limit     = snmp_get($device, $limit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+            $divisor       = "1";
+            discover_sensor($valid['sensor'], 'fanspeed', $device, $fan_oid, $index, 'drac', $descr, $divisor, '1', $low_limit, NULL, NULL, NULL, $current);
+        }
+    }
+}
diff --git a/includes/discovery/temperatures/drac.inc.php b/includes/discovery/temperatures/drac.inc.php
new file mode 100644
index 000000000..e9c77df2b
--- /dev/null
+++ b/includes/discovery/temperatures/drac.inc.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @author     Adam Armstrong <adama@memetic.org>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong
+ *
+ */
+
+if (strstr($device['os'], "drac")) {
+    $oids = snmp_walk($device, "temperatureProbeStatus", "-Osqn", "IDRAC-MIB-SMIv2");
+    if ($debug) {
+        echo($oids."\n");
+    }
+    $oids = trim($oids);
+    if ($oids) echo("Dell iDRAC");
+    foreach (explode("\n", $oids) as $data) {
+        $data = trim($data);
+        if ($data) {
+            list($oid,$status) = explode(" ", $data, 2);
+            if ($debug) {
+                echo("status : ".$status."\n"); 
+            }
+            if ($status == "ok") {
+                $split_oid        = explode('.',$oid);
+                $temperature_id   = $split_oid[count($split_oid)-2].".".$split_oid[count($split_oid)-1];
+                $descr_oid        = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.8.$temperature_id";
+                $temperature_oid  = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.6.$temperature_id";
+                $limit_oid        = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.10.$temperature_id";
+                $warnlimit_oid    = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.11.$temperature_id";
+                $lowwarnlimit_oid = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.12.$temperature_id";
+                $lowlimit_oid     = ".1.3.6.1.4.1.674.10892.5.4.700.20.1.13.$temperature_id";
+
+                $descr        = trim(snmp_get($device, $descr_oid, "-Oqv", "IDRAC-MIB-SMIv2"),'"');
+                $temperature  = snmp_get($device, $temperature_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+                $lowwarnlimit = snmp_get($device, $lowwarnlimit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+                $warnlimit    = snmp_get($device, $warnlimit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+                $limit        = snmp_get($device, $limit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+                $lowlimit     = snmp_get($device, $lowlimit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+
+                discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'drac', $descr, '10', '1', $lowlimit/10, $low_warn_limit/10, $warnlimit/10, $limit/10, $temperature/10);
+            }
+        }
+    }
+}
diff --git a/includes/discovery/voltages/drac.inc.php b/includes/discovery/voltages/drac.inc.php
new file mode 100644
index 000000000..b23453eff
--- /dev/null
+++ b/includes/discovery/voltages/drac.inc.php
@@ -0,0 +1,29 @@
+<?php
+
+if ($device['os'] == "drac") {
+    $oids = snmp_walk($device, "powerSupplyIndex.1", "-OsqnU", "IDRAC-MIB-SMIv2");
+    if ($debug) {
+        echo($oids."\n");
+    }
+    $oids = trim($oids);
+    if ($oids) {
+        echo("Dell iDRAC");
+    }
+    foreach (explode("\n", $oids) as $data) {
+        $data = trim($data);
+        if ($data) {
+            list($oid,$kind) = explode(" ", $data);
+            $split_oid = explode('.',$oid);
+            $index = $split_oid[count($split_oid)-1];
+            $voltage_oid   = ".1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.$index";
+            $descr_oid     = "powerSupplyLocationName.1.$index";
+            $limit_oid     = "powerSupplyMaximumInputVoltage.1.$index";
+            $descr         = trim(snmp_get($device, $descr_oid, "-Oqv", "IDRAC-MIB-SMIv2"),'"');
+            $descr         = preg_replace("/(Status)/","", $descr);
+            $current       = snmp_get($device, $fan_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+            $low_limit     = snmp_get($device, $limit_oid, "-Oqv", "IDRAC-MIB-SMIv2");
+            $divisor       = "1";
+            discover_sensor($valid['sensor'], 'voltage', $device, $voltage_oid, $index, 'drac', $descr, $divisor, '1', $low_limit, NULL, NULL, NULL, $current);
+        }
+    }
+}