diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 66108939ef..e00aa1834b 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,5 +1,7 @@
 2009-12-28  Sancho Lerena <slerena@artica.es>
 
+	* util/pandora_logrotate: Optimized logrotate setup.
+
 	* pandora_server.spec: Start tentacle after install breaks the
 	Upgrade process on RPM (error if already running).
 
diff --git a/pandora_server/util/pandora_logrotate b/pandora_server/util/pandora_logrotate
index 937095430e..4e07481fbb 100644
--- a/pandora_server/util/pandora_logrotate
+++ b/pandora_server/util/pandora_logrotate
@@ -1,14 +1,40 @@
-/var/log/pandora/pandora*.log /var/log/pandora/pandora_server.error {
+/var/log/pandora/pandora_agent.log 
+/var/log/pandora/pandora_server.log 
+/var/log/pandora/pandora_server.error {
 	weekly
 	missingok
-	size 262144
-	rotate 5
+	size 128144
+	rotate 3
 	maxage 15
 	compress
 	notifempty
-	create 640 root root
+	create 644 root root
 	sharedscripts
 	postrotate
-	for i in `ls -1 /etc/init.d/pandora_*`;do $i stop; $i start; done
+	/etc/init.d/pandora_server restart
 	endscript
 }
+
+# Only for SUSE / DEBIAN / UBUNTU 
+
+/var/www/pandora_console 
+/srv/www/htdocs/pandora_console/pandora_console.log {
+	weekly
+	missingok
+	size 100000
+	rotate 3
+	maxage 15
+	compress
+	notifempty
+	create 644 wwwrun www
+}
+
+/var/log/pandora/pandora_snmptrap.log {
+	daily
+	missingok
+	size 150000
+	rotate 1
+	maxage 7
+	notifempty
+	create 644 root root
+}