diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 687a191bed..d9e9c4f96a 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -44,7 +44,17 @@ echo "Make directory system tree for package."
 cp DEBIAN temp_package -R
 chmod 755 -R temp_package/DEBIAN
 
-cp -aRf * temp_package/usr/share/pandora_agent/
+#Next lines is same to
+#cp -aRf * temp_package/usr/share/pandora_agent/
+#but don't copy recursive the temp_package into temp_package
+
+for item in `ls`
+do
+	if  [ $item != 'temp_package' ]
+	then
+		cp -aRf $item temp_package/usr/share/pandora_agent/
+	fi
+done
 cp -aRf tentacle_client temp_package/usr/bin/
 cp -aRf pandora_agent temp_package/usr/bin/
 cp -aRf pandora_exec temp_package/usr/bin/
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 43e02d714e..71e2202362 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-01  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* DEBIAN/make_deb_package.sh: fixed recursive infinite loop with try to
+	copy "temp_package" into "temp_package/usr/share/pandora_agent/temp_package"
+	again and again.
+
 2010-11-01  Sancho Lerena <slerena@artica.es>
 
 	* DEBIAN/control,