diff --git a/html/includes/graphs/device_cpu_junos.inc.php b/html/includes/graphs/device_cpu_junos.inc.php
new file mode 100644
index 0000000000..a8bd7900f7
--- /dev/null
+++ b/html/includes/graphs/device_cpu_junos.inc.php
@@ -0,0 +1,25 @@
+<?php
+
+$unit_text = "Load %";
+
+$units='%';
+$total_units='%';
+$colours='mixed';
+
+$scale_min = "0";
+$scale_max = "100";
+
+$nototal = 1;
+
+include("common.inc.php");
+$database = $config['rrd_dir'] . "/" . $hostname . "/junos-cpu.rrd";
+
+$rrd_options .= " DEF:load=$database:LOAD:AVERAGE";
+$rrd_options .= " DEF:load_max=$database:LOAD:MAX";
+$rrd_options .= " DEF:load_min=$database:LOAD:MIN";
+$rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
+$rrd_options .= " AREA:load#ffee99: LINE1.25:load#aa2200:Load\ %";
+$rrd_options .= " GPRINT:load:LAST:%6.2lf\  GPRINT:load_min:AVERAGE:%6.2lf\ ";
+$rrd_options .= " GPRINT:load_max:MAX:%6.2lf\  GPRINT:load:AVERAGE:%6.2lf\\\\n";
+
+?>
diff --git a/includes/polling/device-junos.inc.php b/includes/polling/device-junos.inc.php
index bd0e50808a..07308004c8 100644
--- a/includes/polling/device-junos.inc.php
+++ b/includes/polling/device-junos.inc.php
@@ -27,22 +27,23 @@ $cpu_usage = trim(shell_exec($cpu_cmd));
 
 if (is_numeric($cpu_usage))
 {
-  if (!is_file($cpurrd)) {
-    shell_exec($config['rrdtool'] . " create $cpurrd \
-    --step 300 \
-     DS:cpu:GAUGE:600:0:100 \
-     RRA:AVERAGE:0.5:1:800 \
-     RRA:AVERAGE:0.5:6:800 \
-     RRA:AVERAGE:0.5:24:800 \
-     RRA:AVERAGE:0.5:288:800 \
-     RRA:MAX:0.5:1:800 \
-     RRA:MAX:0.5:6:800 \
-     RRA:MAX:0.5:24:800 \
-     RRA:MAX:0.5:288:800");
+  if (!is_file($cpurrd)) 
+  {
+    $rrdcreate = shell_exec($config['rrdtool'] ." create $cpurrd --step 300 DS:LOAD:GAUGE:600:-1:100 RRA:AVERAGE:0.5:1:1200                  RRA:AVERAGE:0.5:1:2000 \
+                    RRA:AVERAGE:0.5:6:2000 \
+                    RRA:AVERAGE:0.5:24:2000 \
+                    RRA:AVERAGE:0.5:288:2000 \
+                    RRA:MAX:0.5:1:2000 \
+                    RRA:MAX:0.5:6:2000 \
+                    RRA:MAX:0.5:24:2000 \
+                    RRA:MAX:0.5:288:2000 \
+                    RRA:MIN:0.5:1:2000 \
+                    RRA:MIN:0.5:6:2000 \
+                    RRA:MIN:0.5:24:2000 \
+                    RRA:MIN:0.5:288:2000");
   }
-
-  if ($cpu_usage) { echo "CPU: $cpu_usage%\n"; }
-  shell_exec($config['rrdtool'] . " update $cpurrd N:$cpu_usage");
+  echo "CPU: $cpu_usage%\n";
+  rrdtool_update($cpurrd, " N:$cpu_usage");
 }
 
 include("hr-mib.inc.php");