diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d23bc31243..6751e82836 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-16  Sancho Lerena <slerena@artica.es>
+
+	* extensions/vnc_view.php,
+	images/vnc.png: New version of VNC extension, to operate with remote plugin
+	instead local one. Add a lot of docs about this extension and remote management
+	with Pandora. Removed old stuff on SSH extension due problems reported.
+
 2011-08-16  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_graph.php, operation/agentes/stat_win.php: fixeds to
diff --git a/pandora_console/extensions/ssh_console.php b/pandora_console/extensions/ssh_console.php
deleted file mode 100644
index a59b3376f5..0000000000
--- a/pandora_console/extensions/ssh_console.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-extensions_add_opemode_tab_agent ('ssh_console','SSH Console','extensions/ssh_console/ssh.png',"main_ssh_console");
-
-
-function main_ssh_console () {
-
-	$id_agente = get_parameter ("id_agente");
-
-	$ip = db_get_sql ("SELECT direccion FROM tagente WHERE id_agente = $id_agente");
-
-?>
-<div>
-<applet code="com.mindbright.application.MindTerm.class" style="border: 2px;" archive="extensions/ssh_console/mindterm.jar" width="720" height="500">
-	<param name="sepframe" value="false">
-	<param name="debug" value="false">
-	<param name="verbose" value="false">
-	<param name="bg-color" value="black">
-	<param name="fg-color" value="white">
-	<param name="resizable" value="true">
-	<param name="save-lines" value="2000">
-	<param name="menus" value="pop2"5>
-	<param name="exit-on-logout" value="true">
-	<param name="server" value="<?PHP echo $ip; ?>">
-</applet>
-</div>
-<?php
-
-}
-
-?>
diff --git a/pandora_console/extensions/ssh_console/howto_sign_applet.README b/pandora_console/extensions/ssh_console/howto_sign_applet.README
deleted file mode 100644
index df038b2971..0000000000
--- a/pandora_console/extensions/ssh_console/howto_sign_applet.README
+++ /dev/null
@@ -1,8 +0,0 @@
-Follow the steps here: http://www-personal.umich.edu/~lsiden/tutorials/signed-applet/signed-applet.html
-
- keytool -genkey 
- keytool -selfcert 
- jarsigner mindterm.jar mykey
-
-Voila ! :-) 
-
diff --git a/pandora_console/extensions/ssh_console/ssh.png b/pandora_console/extensions/ssh_console/ssh.png
deleted file mode 100644
index bfce27b5a9..0000000000
Binary files a/pandora_console/extensions/ssh_console/ssh.png and /dev/null differ
diff --git a/pandora_console/extensions/ssh_console/ssh_console.readme b/pandora_console/extensions/ssh_console/ssh_console.readme
deleted file mode 100644
index 81a652951f..0000000000
--- a/pandora_console/extensions/ssh_console/ssh_console.readme
+++ /dev/null
@@ -1,18 +0,0 @@
-You have several options to use a SSH Java Plugin for SSH access from pandora:
-
-OpenSource (GPL).
-
-https://sourceforge.net/projects/gsi-sshterm/
-http://freshmeat.net/projects/sshtools-sshterm/
-
-Commercial (we cannot redistribute the applet due license restrictions!)
-
-http://www.appgate.com/downloads/MindTerm-3.4/mindterm_3.4-bin.zip
-
-In this extension we use Mindterm as default. just Get the JAR file and put on the extension/ssh_console directory with "mindterm.jar" filename. It will work.
-
-Another option is to use a full-featured SSH like JCTerm, but it cannot use IP from pandora and you need to set it yourself :(
-
-http://www.jcraft.com/jcterm/
-
-
diff --git a/pandora_console/extensions/vnc/VncViewer.jar b/pandora_console/extensions/vnc/VncViewer.jar
deleted file mode 100644
index deae566cab..0000000000
Binary files a/pandora_console/extensions/vnc/VncViewer.jar and /dev/null differ
diff --git a/pandora_console/extensions/vnc/howto_selfsign_applet.README b/pandora_console/extensions/vnc/howto_selfsign_applet.README
deleted file mode 100644
index ea44ca90fa..0000000000
--- a/pandora_console/extensions/vnc/howto_selfsign_applet.README
+++ /dev/null
@@ -1,9 +0,0 @@
-Get the original VNC Applet from the Tightvnc website.
-
-Follow the steps here: http://www-personal.umich.edu/~lsiden/tutorials/signed-applet/signed-applet.html
-
- keytool -genkey 
- keytool -selfcert 
- jarsigner VncViewer.jar mykey
-
-Voila ! :-) 
diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php
index 1207fd8590..c73381133f 100644
--- a/pandora_console/extensions/vnc_view.php
+++ b/pandora_console/extensions/vnc_view.php
@@ -18,14 +18,9 @@ function vnc_view() {
 	$idAgent = (int)get_parameter('id_agente', 0);
 	$ipAgent = db_get_value('direccion', 'tagente', 'id_agente', $idAgent);
 
-	echo '<applet code="VncViewer.class" archive="extensions/vnc/VncViewer.jar" width="750" height="800">';
-	echo '<param name="Host" value="'.$ipAgent.'">';
-	echo '<param name="Port" value="5901">';
-	echo '<param name="Scaling factor" value="75">';
-	echo '</applet>';
-
-/* 	<iframe width="95%" height="500px" src="http://<?php echo $ipAgent;?>:5801"></iframe> */
+	echo "<iframe src='http://$ipAgent:5800' width='100%' height=550>";
+	echo "</iframe>";
 }
 
-extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/computer.png', 'vnc_view');
+extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/vnc.png', 'vnc_view');
 ?>
diff --git a/pandora_console/images/vnc.png b/pandora_console/images/vnc.png
new file mode 100644
index 0000000000..549a1d933c
Binary files /dev/null and b/pandora_console/images/vnc.png differ