diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d350913117..0cb1da007f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,28 @@
+2012-10-15 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* operation/extensions.php,
+	godmode/extensions.php,
+	include/functions_extensions.php,
+	extensions/insert_data.php,
+	extensions/snmp_explorer.php,
+	extensions/system_info.php,
+	extensions/net_tools.php,
+	extensions/extension_uploader.php,
+	extensions/pandora_logs.php,
+	extensions/agents_modules.php,
+	extensions/update_manager.php,
+	extensions/ssh_gateway.php,
+	extensions/dbmanager.php,
+	extensions/vnc_view.php,
+	extensions/resource_registration.php,
+	extensions/users_connected.php,
+	extensions/resource_exportation.php,
+	extensions/module_groups.php,
+	extensions/plugin_registration.php: Modified extension to 
+	show versions.
+
+	MERGED FROM 4.0.2
+
 2012-10-15  Vanessa Gil <vanessa.gil@artica.es>
 
 	* include/functions_api.php: Added function validate_event_
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 81d3ff9e54..938a392b2d 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -310,7 +310,7 @@ function mainAgentsModules() {
 	"</p>";
 }
 
-extensions_add_operation_menu_option(__("Agents/Modules view"), 'estado', 'agents_modules/icon_menu.png');
+extensions_add_operation_menu_option(__("Agents/Modules view"), 'estado', 'agents_modules/icon_menu.png', "v1r1");
 extensions_add_main_function('mainAgentsModules');
 
 ?>
\ No newline at end of file
diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index 2ce7c81dd9..6ca44b6e84 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -155,7 +155,7 @@ function dbmgr_extension_main () {
 }
 
 /* This adds a option in the operation menu */
-extensions_add_godmode_menu_option (__('DB interface'), 'PM','gdbman',"dbmanager/icon.png");
+extensions_add_godmode_menu_option (__('DB interface'), 'PM','gdbman',"dbmanager/icon.png","v1r1");
 
 /* This sets the function to be called when the extension is selected in the operation menu */
 extensions_add_godmode_function ('dbmgr_extension_main');
diff --git a/pandora_console/extensions/extension_uploader.php b/pandora_console/extensions/extension_uploader.php
index 22ab83e924..1fa33029ba 100644
--- a/pandora_console/extensions/extension_uploader.php
+++ b/pandora_console/extensions/extension_uploader.php
@@ -86,6 +86,6 @@ function extension_uploader_extensions() {
 	echo "</form>";
 }
 
-extensions_add_godmode_menu_option(__('Extension uploader'), 'AM');
+extensions_add_godmode_menu_option(__('Extension uploader'), 'AM', null, null, "v1r1");
 extensions_add_godmode_function('extension_uploader_extensions');
 ?>
diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 68f407d6c8..744da1be8d 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -240,5 +240,5 @@ function mainInsertData() {
 }
 
 extensions_add_godmode_function('mainInsertData');
-extensions_add_godmode_menu_option(__('Insert Data'), 'AW', 'gagente');
+extensions_add_godmode_menu_option(__('Insert Data'), 'AW', 'gagente', null, "v1r1");
 ?>
\ No newline at end of file
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 612c6795f0..5dc89b2439 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -297,6 +297,6 @@ function mainModuleGroups() {
 	<?php
 }
  
-extensions_add_operation_menu_option(__("Modules groups"), 'estado', 'module_groups/brick.png');
+extensions_add_operation_menu_option(__("Modules groups"), 'estado', 'module_groups/brick.png', "v1r1");
 extensions_add_main_function('mainModuleGroups');
 ?>
diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php
index d09783478a..a6b7521e94 100644
--- a/pandora_console/extensions/net_tools.php
+++ b/pandora_console/extensions/net_tools.php
@@ -14,7 +14,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
-extensions_add_opemode_tab_agent ('network_tools','Network Tools','extensions/net_tools/nettool.png',"main_net_tools");
+extensions_add_opemode_tab_agent ('network_tools','Network Tools','extensions/net_tools/nettool.png',"main_net_tools", "v1r1");
 
 function whereis_the_command ($command) {
 	
diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php
index b4dc447c7c..e68e003ccf 100644
--- a/pandora_console/extensions/pandora_logs.php
+++ b/pandora_console/extensions/pandora_logs.php
@@ -62,7 +62,7 @@ function pandoralogs_extension_main () {
 	view_logfile ("/var/log/pandora/pandora_server.error");
 }
 
-extensions_add_godmode_menu_option (__('System logfiles'), 'PM','glog',"");
+extensions_add_godmode_menu_option (__('System logfiles'), 'PM','glog', null, "v1r1");
 extensions_add_godmode_function('pandoralogs_extension_main');
 
 ?>
diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 54db0ced34..3f83e93747 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -235,7 +235,7 @@ function pluginreg_convert_plugin_1_to_2($plugin) {
 	return $plugin;
 }
 
-extensions_add_godmode_menu_option (__('Register plugin'), 'PM','gservers','');
+extensions_add_godmode_menu_option (__('Register plugin'), 'PM','gservers', null, "v1r1");
 extensions_add_godmode_function('pluginreg_extension_main');
 
 ?>
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 02ec30bdf0..de974eb441 100644
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -58,7 +58,7 @@ if (isset($_GET['get_ptr'])) {
 	}
 }
 else {
-	extensions_add_godmode_menu_option (__('Resource exportation'), 'PM','gservers','');
+	extensions_add_godmode_menu_option (__('Resource exportation'), 'PM','gservers','', "v1r1");
 	extensions_add_godmode_function('resource_exportation_extension_main');
 }
 
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index b7fec3b5b1..45e46d9bab 100644
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -867,6 +867,6 @@ function resource_registration_extension_main() {
 	process_upload_xml($xml);
 }
 
-extensions_add_godmode_menu_option (__('Resource registration'), 'PM','gservers','');
+extensions_add_godmode_menu_option (__('Resource registration'), 'PM','gservers','', "v1r1");
 extensions_add_godmode_function('resource_registration_extension_main');
 ?>
diff --git a/pandora_console/extensions/snmp_explorer.php b/pandora_console/extensions/snmp_explorer.php
index 2baf4ccab5..b9a6da89cd 100755
--- a/pandora_console/extensions/snmp_explorer.php
+++ b/pandora_console/extensions/snmp_explorer.php
@@ -484,5 +484,5 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
 }
 
 
-extensions_add_godmode_tab_agent('snmp_explorer', __('SNMP Explorer'), 'images/snmp_wizard.png', 'snmp_explorer');
+extensions_add_godmode_tab_agent('snmp_explorer', __('SNMP Explorer'), 'images/snmp_wizard.png', 'snmp_explorer', "v1r1");
 ?>
diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php
index c4e5f82b11..c0780c90db 100644
--- a/pandora_console/extensions/ssh_gateway.php
+++ b/pandora_console/extensions/ssh_gateway.php
@@ -14,7 +14,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 
-extensions_add_opemode_tab_agent ('ssh_gateway','SSH Gateway','extensions/ssh_gateway/secure_console.png',"ssh_gateway");
+extensions_add_opemode_tab_agent ('ssh_gateway','SSH Gateway','extensions/ssh_gateway/secure_console.png',"ssh_gateway", "v1r1");
 
 function ssh_gateway () {
 	
diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php
index e91d333638..f8dbb8d6bb 100644
--- a/pandora_console/extensions/system_info.php
+++ b/pandora_console/extensions/system_info.php
@@ -616,7 +616,7 @@ function consoleMode() {
 if (!isset($argv)) {
 	//Execution across the browser
 	extensions_add_godmode_function('mainSystemInfo');
-	extensions_add_godmode_menu_option(__('System Info'), 'PM', 'gsetup');
+	extensions_add_godmode_menu_option(__('System Info'), 'PM', 'gsetup', null, "v1r1");
 }
 else {
 	$dir = dirname($_SERVER['PHP_SELF']);
diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php
index 5c3ef582da..f1baef1f1d 100644
--- a/pandora_console/extensions/update_manager.php
+++ b/pandora_console/extensions/update_manager.php
@@ -225,8 +225,8 @@ function pandora_update_manager_godmode () {
 	require_once ('update_manager/settings.php');
 }
 
-extensions_add_operation_menu_option (__('Update manager'));
-extensions_add_godmode_menu_option (__('Update manager settings'), 'PM');
+extensions_add_operation_menu_option (__('Update manager'), null, null, "v1r1");
+extensions_add_godmode_menu_option (__('Update manager settings'), 'PM', null, null, "v1r1");
 extensions_add_main_function ('pandora_update_manager_main');
 extensions_add_godmode_function ('pandora_update_manager_godmode');
 extensions_add_login_function ('pandora_update_manager_login');
diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php
index 49a4cc1e4b..4e2344d97d 100644
--- a/pandora_console/extensions/users_connected.php
+++ b/pandora_console/extensions/users_connected.php
@@ -112,11 +112,11 @@ function users_extension_main_god ($god = true) {
 		html_print_table ($table);
 	}
 }
-extensions_add_godmode_menu_option (__('Users connected'), 'UM','gusuarios',"users/icon.png");
+extensions_add_godmode_menu_option (__('Users connected'), 'UM','gusuarios',"users/icon.png", "v1r1");
 
 if (isset($config["id_user"])) {
 	if (check_acl ($config["id_user"], 0, "UM")) {
-		extensions_add_operation_menu_option(__('Users connected'), 'workspace',"users/icon.png");
+		extensions_add_operation_menu_option(__('Users connected'), 'workspace',"users/icon.png", "v1r1");
 	}
 }
 
diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php
index c73381133f..eb44010e66 100644
--- a/pandora_console/extensions/vnc_view.php
+++ b/pandora_console/extensions/vnc_view.php
@@ -22,5 +22,5 @@ function vnc_view() {
 	echo "</iframe>";
 }
 
-extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/vnc.png', 'vnc_view');
+extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/vnc.png', 'vnc_view', "v1r1");
 ?>
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index b75f3f1899..2e956c04ac 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -145,6 +145,7 @@ $table->width = '98%';
 
 $table->head = array();
 $table->head[] = __('File');
+$table->head[] = __('Version');
 $table->head[] = "<span title='" . __("Enterprise") . "'>" . __('E.') . "</span>";
 $table->head[] = "<span title='" . __("Godmode Function") . "'>" . __('G.F.') . "</span>";
 $table->head[] = "<span title='" . __("Godmode Menu") . "'>" . __('G.M.') . "</span>";
@@ -157,6 +158,7 @@ $table->head[] = "<span title='" . __("Operation") . "'>" . __('O.') . "</span>"
 
 $table->width = array();
 $table->width[] = '30%';
+$table->width[] = '30%';
 $table->width[] = '22px';
 $table->width[] = '44px';
 $table->width[] = '44px';
@@ -177,6 +179,7 @@ $table->align[] = 'center';
 $table->align[] = 'center';
 $table->align[] = 'center';
 $table->align[] = 'center';
+$table->align[] = 'center';
 
 $table->data = array();
 foreach ($extensions as $file => $extension) {
@@ -188,9 +191,39 @@ foreach ($extensions as $file => $extension) {
 		$on = html_print_image("images/dot_green.disabled.png", true); 
 		$off = html_print_image("images/dot_red.disabled.png", true);
 		$data[] = '<i style="color: grey;">' . $file . '</i>';
+
+		//Get version of this extensions
+		if ($config['extensions'][$file]['operation_menu']) {
+			$data[] = $config['extensions'][$file]['operation_menu']['version'];
+		}
+
+		if ($config['extensions'][$file]['godmode_menu']) {
+
+			$data[] = $config['extensions'][$file]['godmode_menu']['version'];
+		}
+
+                if ($config['extensions'][$file]['extension_ope_tab']) {
+                        $data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
+                } else if ($config['extensions'][$file]['extension_god_tab']) {
+                        $data[] = $config['extensions'][$file]['extension_god_tab']['version'];
+                }
+
+
 	}
 	else {
 		$data[] = $file;
+
+		//Get version of this extension
+                if ($config['extensions'][$file]['operation_menu']) {
+                        $data[] = $config['extensions'][$file]['operation_menu']['version'];
+                } else if ($config['extensions'][$file]['godmode_menu']) {
+                        $data[] = $config['extensions'][$file]['godmode_menu']['version'];
+                } else if ($config['extensions'][$file]['extension_ope_tab']) {
+		        $data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
+                } else if ($config['extensions'][$file]['extension_god_tab']) {
+                        $data[] = $config['extensions'][$file]['extension_god_tab']['version'];
+                }
+
 	}
 	
 	if ($extension['enterprise']) {
diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php
index d01224bee9..e6757efd39 100644
--- a/pandora_console/include/functions_extensions.php
+++ b/pandora_console/include/functions_extensions.php
@@ -296,7 +296,7 @@ function extensions_load_extensions ($extensions) {
  * @param string fatherId Id of the parent menu item for the current extension 
  * @param string icon Path to the icon image (18x18 px). If this parameter is blank then predefined icon will be used
  */
-function extensions_add_operation_menu_option ($name, $fatherId = null, $icon = null) {
+function extensions_add_operation_menu_option ($name, $fatherId = null, $icon = null, $version="N/A") {
 	global $config;
 	global $extension_file;
 	
@@ -309,6 +309,7 @@ function extensions_add_operation_menu_option ($name, $fatherId = null, $icon =
 	$option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4);
 	$option_menu['fatherId'] = $fatherId;
 	$option_menu['icon'] = $icon;
+	$option_menu['version'] = $version;
 	$extension['operation_menu'] = $option_menu;
 }
 
@@ -320,7 +321,7 @@ function extensions_add_operation_menu_option ($name, $fatherId = null, $icon =
  * @param string fatherId Id of the parent menu item for the current extension 
  * @param string icon Path to the icon image (18x18 px). If this parameter is blank then predefined icon will be used
  */
-function extensions_add_godmode_menu_option ($name, $acl, $fatherId = null, $icon = null) {
+function extensions_add_godmode_menu_option ($name, $acl, $fatherId = null, $icon = null, $version="N/A") {
 	global $config;
 	global $extension_file;
 	
@@ -333,6 +334,7 @@ function extensions_add_godmode_menu_option ($name, $acl, $fatherId = null, $ico
 	$option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4);
 	$option_menu['fatherId'] = $fatherId;
 	$option_menu['icon'] = $icon;
+	$option_menu['version'] = $version;
 	$extension['godmode_menu'] = $option_menu;
 }
 
@@ -344,7 +346,7 @@ function extensions_add_godmode_menu_option ($name, $acl, $fatherId = null, $ico
  * @param tabIcon Path to the image icon 
  * @param tabFunction Name of the function to execute when this extension is called
  */
-function extensions_add_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction) {
+function extensions_add_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction, $version="N/A") {
 	global $config;
 	global $extension_file;
 	
@@ -354,6 +356,7 @@ function extensions_add_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFuncti
 	$extension['extension_god_tab']['name'] = $tabName;
 	$extension['extension_god_tab']['icon'] = $tabIcon;
 	$extension['extension_god_tab']['function'] = $tabFunction;
+	$extension['extension_god_tab']['version'] = $version;
 }
 
 /**
@@ -364,7 +367,7 @@ function extensions_add_godmode_tab_agent($tabId, $tabName, $tabIcon, $tabFuncti
  * @param tabIcon Path to the image icon 
  * @param tabFunction Name of the function to execute when this extension is called
  */
-function extensions_add_opemode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction) {
+function extensions_add_opemode_tab_agent($tabId, $tabName, $tabIcon, $tabFunction, $version="N/A") {
 	global $config;
 	global $extension_file;
 	
@@ -374,6 +377,7 @@ function extensions_add_opemode_tab_agent($tabId, $tabName, $tabIcon, $tabFuncti
 	$extension['extension_ope_tab']['name'] = $tabName;
 	$extension['extension_ope_tab']['icon'] = $tabIcon;
 	$extension['extension_ope_tab']['function'] = $tabFunction;
+        $extension['extension_ope_tab']['version'] = $version;
 }
 
 /**
diff --git a/pandora_console/operation/extensions.php b/pandora_console/operation/extensions.php
index aa6d887bdc..7c505cf82d 100644
--- a/pandora_console/operation/extensions.php
+++ b/pandora_console/operation/extensions.php
@@ -45,9 +45,11 @@ if ($delete != ""){
 $table->width = '60%';
 $table->head = array ();
 $table->head[0] = __('Name');
-$table->head[1] = __('Action');
+$table->head[1] = __('Version');
+$table->head[2] = __('Action');
 $table->style = array();
-$table->style[1] = 'text-align: center; font-weight: bolder;';
+$table->style[1] = 'text-align: center;';
+$table->style[2] = 'text-align: center; font-weight: bolder;';
 $table->data = array ();
 
 foreach ($config['extensions'] as $extension) {
@@ -58,7 +60,8 @@ foreach ($config['extensions'] as $extension) {
 	
 	$data = array ();
 	$data[0] = $extension['operation_menu']['name'];
-	$data[1] = '<a href="index.php?sec=extensions&amp;sec2='.$extension['operation_menu']['sec2'].'" class="mn">' . __('Execute') . '</a>';
+	$data[1] = $extension['operation_menu']['version'];
+	$data[2] = '<a href="index.php?sec=extensions&amp;sec2='.$extension['operation_menu']['sec2'].'" class="mn">' . __('Execute') . '</a>';
 
 	array_push ($table->data, $data);
 }