diff --git a/html/includes/graphs/fanspeed.inc.php b/html/includes/graphs/fanspeed.inc.php
index 8f6b03cd8..c3edbda43 100644
--- a/html/includes/graphs/fanspeed.inc.php
+++ b/html/includes/graphs/fanspeed.inc.php
@@ -21,7 +21,7 @@ include("common.inc.php");
   $rrd_options .= " AREA:fanwarm#FF9999";
   $rrd_options .= " LINE1.5:fan#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($fanspeed['fan_descr_fixed'])))."'"; # Ugly hack :(
   $rrd_options .= " LINE1.5:fanwarm#660000";
-  $rrd_options .= " GPRINT:fan:LAST:%3.0lfC";
-  $rrd_options .= " GPRINT:fan:MAX:%3.0lfC\\\\l";
+  $rrd_options .= " GPRINT:fan:LAST:%3.0lfrpm";
+  $rrd_options .= " GPRINT:fan:MAX:%3.0lfrpm\\\\l";
 
 ?>
diff --git a/html/includes/graphs/voltage.inc.php b/html/includes/graphs/voltage.inc.php
index 84eb3193f..2b515b1b1 100644
--- a/html/includes/graphs/voltage.inc.php
+++ b/html/includes/graphs/voltage.inc.php
@@ -21,7 +21,7 @@ include("common.inc.php");
   $rrd_options .= " AREA:voltwarm#FF9999";
   $rrd_options .= " LINE1.5:volt#cc0000:'" . $voltage['volt_descr_fixed']."'";
   $rrd_options .= " LINE1.5:voltwarm#660000";
-  $rrd_options .= " GPRINT:volt:LAST:%3.0lfC";
-  $rrd_options .= " GPRINT:volt:MAX:%3.0lfC\\\\l";
+  $rrd_options .= " GPRINT:volt:LAST:%3.0lfV";
+  $rrd_options .= " GPRINT:volt:MAX:%3.0lfV\\\\l";
 
 ?>