diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index bc4b4be517..23ab98bb48 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* DEBIAN/make_deb_package.sh: added the code to include the man pages into
+	DEB package.
+
 2010-06-09  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_server.spec: Create the man dir.
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 12727db9ab..4d448a7889 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -75,6 +75,7 @@ then
 	mkdir -p temp_package/var/log/pandora/
 	mkdir -p temp_package/usr/share/pandora_server/conf/
 	mkdir -p temp_package/usr/lib/perl5/
+	mkdir -p temp_package/usr/share/man/man1/
 	
 	cp -aRf bin/pandora_server temp_package/usr/bin/
 	cp -aRf bin/pandora_exec temp_package/usr/bin/
@@ -88,6 +89,8 @@ then
 	cp -aRf util/pandora_server temp_package/etc/init.d/
 	cp -aRf util/tentacle_serverd temp_package/etc/init.d/
 	
+	cp -aRf man/man1/* temp_package/usr/share/man/man1/
+	
 	rm -f temp_package/usr/share/pandora_server/util/PandoraFMS
 	rm -f temp_package/usr/share/pandora_server/bin/PandoraFMS