diff --git a/html/includes/graphs/device/dBm.inc.php b/html/includes/graphs/device/dbm.inc.php
similarity index 100%
rename from html/includes/graphs/device/dBm.inc.php
rename to html/includes/graphs/device/dbm.inc.php
diff --git a/html/includes/graphs/sensor/dbm.inc.php b/html/includes/graphs/sensor/dbm.inc.php
new file mode 100644
index 000000000..a4ea9191f
--- /dev/null
+++ b/html/includes/graphs/sensor/dbm.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+$scale_min = "0";
+
+include("includes/graphs/common.inc.php");
+
+$rrd_options .= " COMMENT:'                       Min       Last      Max\\n'";
+
+$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 18),0,18);
+
+$rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
+$rrd_options .= " LINE1.5:sensor#cc0000:'" . $sensor['sensor_descr_fixed']."'";
+$rrd_options .= " GPRINT:sensor$current_id:MIN:%5.2lfdBm";
+$rrd_options .= " GPRINT:sensor:LAST:%5.2lfdBm";
+$rrd_options .= " GPRINT:sensor:MAX:%5.2lfdBm\\\\l";
+
+if (is_numeric($sensor['sensor_limit'])) $rrd_options .= " HRULE:".$sensor['sensor_limit']."#999999::dashes";
+if (is_numeric($sensor['sensor_limit_low'])) $rrd_options .= " HRULE:".$sensor['sensor_limit_low']."#999999::dashes";
+
+?>
diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php
index 4cc842980..97244c836 100644
--- a/html/pages/device/health.inc.php
+++ b/html/pages/device/health.inc.php
@@ -27,7 +27,7 @@ if ($volts) { $datas[] = 'voltage'; }
 if ($freqs) { $datas[] = 'frequency'; }
 if ($current) { $datas[] = 'current'; }
 if ($power) { $datas[] = 'power'; }
-if ($dBm) { $datas[] = 'dBm'; }
+if ($dBm) { $datas[] = 'dbm'; }
 
 $type_text['overview'] = "Overview";
 $type_text['temperature'] = "Temperature";
@@ -41,7 +41,7 @@ $type_text['fanspeed'] = "Fanspeed";
 $type_text['frequency'] = "Frequency";
 $type_text['current'] = "Current";
 $type_text['power'] = "Power";
-$type_text['dBm'] = "dBm";
+$type_text['dbm'] = "dBm";
 
 $link_array = array('page'    => 'device',
                     'device'  => $device['device_id'],
diff --git a/html/pages/device/health/dbm.inc.php b/html/pages/device/health/dbm.inc.php
new file mode 100644
index 000000000..4d264d98f
--- /dev/null
+++ b/html/pages/device/health/dbm.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+$class = "dbm";
+$unit  = "dBm";
+$graph_type = "sensor_dbm";
+
+include("sensors.inc.php");
+
+?>
diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index 79aca9613..067290c29 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -85,11 +85,13 @@ if(is_array($entity_state['group']['c6kxbar'])) { include("overview/c6kxbar.inc.
 include("overview/sensors/temperatures.inc.php");
 include("overview/sensors/humidity.inc.php");
 include("overview/sensors/fanspeeds.inc.php");
+include("overview/sensors/dbm.inc.php");
 include("overview/sensors/voltages.inc.php");
 include("overview/sensors/current.inc.php");
 include("overview/sensors/power.inc.php");
 include("overview/sensors/frequencies.inc.php");
 
+
 echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
 echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
 echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=events/">');
diff --git a/html/pages/device/overview/sensors/dbm.inc.php b/html/pages/device/overview/sensors/dbm.inc.php
new file mode 100644
index 000000000..81646d32c
--- /dev/null
+++ b/html/pages/device/overview/sensors/dbm.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+$graph_type = "sensor_dbm";
+$sensor_class = "dbm";
+$sensor_unit = "dBm";
+$sensor_type = "dBm";
+
+include('pages/device/overview/generic/sensor.inc.php');
+
+?>
diff --git a/html/pages/health/dbm.inc.php b/html/pages/health/dbm.inc.php
new file mode 100644
index 000000000..9d7f49c83
--- /dev/null
+++ b/html/pages/health/dbm.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+$graph_type = "sensor_dbm";
+$class = "dbm";
+$unit = "dBm";
+
+include("pages/health/sensors.inc.php");
+
+?>