diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 388d777b87..78c53e5059 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-11  Esteban Sanchez  <estebans@artica.es>
+
+	* ssh/libssh2/userauth.c: Fixed a bug when the public key file do
+	not finish with '\n' or '\r'.
+
+	* bin/PandoraAgent.exe: Updated to new changes.
+
 2006-10-13  Raśl Mateos  <raulofpandora@gmail.com>
 
 	* installer/Pandora Windows Agent-1.2 Beta3-Setup.exe: Updated
diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe
index 37959d1ed8..9d689992d5 100755
Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ
diff --git a/pandora_agents/win32/ssh/libssh2/userauth.c b/pandora_agents/win32/ssh/libssh2/userauth.c
index 1ff2a06db7..e0323e89af 100644
--- a/pandora_agents/win32/ssh/libssh2/userauth.c
+++ b/pandora_agents/win32/ssh/libssh2/userauth.c
@@ -251,6 +251,8 @@ static int libssh2_file_read_publickey(LIBSSH2_SESSION *session, unsigned char *
 		return -1;
 	}
 	while (!feof(fd) && (c = fgetc(fd)) != '\r' && c != '\n')	pubkey_len++;
+	if (c != '\r' || c != '\n')
+                pubkey_len--;
 	rewind(fd);
 
 	if (pubkey_len <= 1) {