diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 48783564ce..dbf490a7ff 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Ramon Novoa  <rnovoa@artica.es>
+
+	* win32/pandora_windows_service.cc: Added a timeout to the tentacle
+	  client execution.
+
 2011-12-13  Ramon Novoa  <rnovoa@artica.es>
 
 	* win32/installer/pandora.mpi,
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 9efb0ce341..9d178b2e2c 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -447,6 +447,7 @@ Pandora_Windows_Service::copyTentacleDataFile (string host,
 	string	tentacle_cmd, working_dir;
 	PROCESS_INFORMATION pi;
 	STARTUPINFO         si;
+	int tentacle_timeout = 0;
 
 	var = conf->getValue ("temporal");
 	if (var[var.length () - 1] != '\\') {
@@ -487,9 +488,20 @@ Pandora_Windows_Service::copyTentacleDataFile (string host,
 	    CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) {
 		return -1;
 	}
+	
+	/* Timeout */
+	tentacle_timeout = atoi (conf->getValue ("tentacle_timeout").c_str ());
+	if (tentacle_timeout <= 0) {
+		tentacle_timeout = INFINITE;
+	}
 
-	/* Get the return code of the tentacle client*/
-    WaitForSingleObject(pi.hProcess, INFINITE);
+    if (WaitForSingleObject(pi.hProcess, tentacle_timeout) == WAIT_TIMEOUT) {
+		TerminateProcess(pi.hThread, STILL_ACTIVE);
+		CloseHandle (pi.hProcess);
+		return -1;
+	}
+
+	/* Get the return code of the tentacle client*/	
     GetExitCodeProcess (pi.hProcess, &rc);
 	if (rc != 0) {
 		CloseHandle (pi.hProcess);