diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 9e83484f63..8593820048 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-01  Esteban Sanchez  <estebans@artica.es>
+
+	* pandora_windows_service.cpp: Fixed a bug when copying the data file
+	to server, which it didn't include the agent name if it was not
+	defined in configuration file and was taken from Windows functions.
+	
+	* bin/PandoraAgent.exe: Updated to new commit.
+
 2006-11-30 Raul Mateos <raulofpandora@gmail.com>
 
 	* bin/help/*: New directory and files with help for generating keys.
diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe
index 47b6434868..ddc1d8c18b 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/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index ce357866f5..f3b8b8e555 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -196,6 +196,9 @@ Pandora_Windows_Service::pandora_run () {
 	
         random_integer = inttostr (rand());
         tmp_filename = conf->getValue ("agent_name");
+	if (tmp_filename == "") {
+                tmp_filename = Pandora_Windows_Info::getSystemName ();
+        }
         tmp_filename += "." + random_integer + ".data";
                 
         xml_filename = conf->getValue ("temporal");