diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 83a1392196..7e9c9ec846 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-09  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent_installer, pandora_agent.spec: Copy the man pages.
+
 2010-06-08  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Removed the need for indexes in the abstraction layer.
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 8a19f3b4a0..c3c1db35c0 100755
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -44,6 +44,9 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/
 cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/
 cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/
 cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
+cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
 
 # Checking old config file (if exists)
 if [ -f /etc/pandora/pandora_agent.conf ] ; then
@@ -100,6 +103,8 @@ rm /etc/init.d/pandora_agent_daemon
 rm -Rf /etc/pandora/pandora_agent.conf
 rm -Rf /var/log/pandora/pandora_agent* 2> /dev/null
 rm -Rf /usr/share/pandora_agent
+rm -Rf /usr/share/man/man1/pandora_agent.1.gz
+rm -Rf /usr/share/man/man1/tentacle_client.1.gz
 exit 0
 
 %files
@@ -114,7 +119,8 @@ exit 0
 /etc/init.d/pandora_agent_daemon
 %docdir %{prefix}/pandora_agents/docs
 %{prefix}/pandora_agent
-#%{_mandir}/man1/pandora.1.gz
-#%{_mandir}/man1/pandora_agents.1.gz
 
+%defattr(644,pandora,root)
+/usr/share/man/man1/pandora_agent.1.gz
+/usr/share/man/man1/tentacle_client.1.gz
 
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 89da7bdcd2..092c1f9973 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -222,14 +222,11 @@ install () {
 	cp tentacle_client $PANDORA_BASE$TENTACLE
 	chmod 755 $PANDORA_BASE$TENTACLE
 
-	echo "Installing Tentacle Client manual"
-    if [ -f ../man/man1/tentacle_client.1.gz ]
-    then 
-    	cp ../man/man1/tentacle_client.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
-    else
+	echo "Installing the Pandora Agent and Tentacle Client manuals"
     	cp man/man1/tentacle_client.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
-    fi
-    chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/tentacle_client.1.gz
+    	chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/tentacle_client.1.gz
+    	cp man/man1/pandora_agent.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
+    	chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/pandora_agent.1.gz
 
 	echo "Setting secure permissions and ownership for all Pandora FMS Agent files..."
 	chown -R root $PANDORA_BASE$PANDORA_HOME
@@ -359,14 +356,11 @@ install () {
 		cp FreeBSD/pandora_agent $PANDORA_STARTUP
 	fi
 
-	echo "Installing Pandora Agent manual"
-    if [ -e ../man/man1/pandora_agent.1.gz ]
-    then
-    	cp ../man/man1/pandora_agent.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
-    else
+	echo "Installing the Pandora Agent and Tentacle Client manuals"
+    	cp man/man1/tentacle_client.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
+    	chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/tentacle_client.1.gz
     	cp man/man1/pandora_agent.1.gz $PANDORA_BASE/$PANDORA_MAN/man1
-    fi
-    chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/pandora_agent.1.gz
+    	chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/pandora_agent.1.gz
 
 	echo "Done."
 	echo " "