diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 52b4071e97..3c78d8797a 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_windows_service.cc: Convert tentacle_timeout to milliseconds.
+
 2012-02-02  Ramon Novoa  <rnovoa@artica.es>
 
 	* installer/pandora.mpi: Added an uninstall action to delete
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 9d178b2e2c..7b95448a6b 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -493,6 +493,9 @@ Pandora_Windows_Service::copyTentacleDataFile (string host,
 	tentacle_timeout = atoi (conf->getValue ("tentacle_timeout").c_str ());
 	if (tentacle_timeout <= 0) {
 		tentacle_timeout = INFINITE;
+	} else {
+		/* Convert to milliseconds */
+		tentacle_timeout *= 1000;
 	}
 
     if (WaitForSingleObject(pi.hProcess, tentacle_timeout) == WAIT_TIMEOUT) {