diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 8615e76a59..30391080d0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-18  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions.php: in function "format_for_graph" added the units
+	"exa", "zetta" and "yotta".
+	
 2010-01-17 Javier Lanz <javier.lanz@artica.es>
 
 	* trunk/pandora_console/include/functions_ui.php: Fixed an error in print_agent_name
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 497b9c521a..d76c5dd83c 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -249,7 +249,7 @@ function format_numeric ($number, $decimals = 1) {
  * @return string A string with the number and the multiplier
  */
 function format_for_graph ($number , $decimals = 1, $dec_point = ".", $thousands_sep = ",") {
-	$shorts = array ("","K","M","G","T","P");
+	$shorts = array ("", "K", "M", "G", "T", "P", "E", "Z", "Y");
 	$pos = 0;
 	while ($number >= 1000) { //as long as the number can be divided by 1000
 		$pos++; //Position in array starting with 0