diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 9c7771fa09..3a454eff44 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* DEBIAN/control, DEBIAN/make_deb_package.sh,
+	  pandora_server.spec: Updated for the release of Pandora FMS 3.1 RC1.
+
 2010-05-20  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* DEBIAN/make_deb_package.sh: fixed the permissions to DEBIAN temp package. 
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index be48e59b88..766d2371c2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: PandoraFMS-Server
-Version: 3.0.0
+Version: 3.1rc1
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index ae6b795b9f..2374fc9f05 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_console_version="3.1.0"
+pandora_version="3.1rc1"
 
 package_cpan=1
 package_pandora=1
@@ -81,13 +81,17 @@ cp -aRf bin/pandora_server temp_package/usr/bin/
 cp -aRf bin/pandora_exec temp_package/usr/bin/
 cp -aRf bin/tentacle_server temp_package/usr/bin/
 
-cp -aRf conf/* temp_package/pandora_server/conf/
+cp -aRf conf/* temp_package/usr/share/pandora_server/conf/
 cp -aRf util temp_package/usr/share/pandora_server/
 cp -aRf lib/* temp_package/usr/lib/perl5/
 cp -aRf AUTHORS COPYING ChangeLog README temp_package/usr/share/pandora_server/
 
 cp -aRf util/pandora_server temp_package/etc/init.d/
 cp -aRf util/tentacle_serverd temp_package/etc/init.d/
+
+rm -f temp_package/usr/share/pandora_server/util/PandoraFMS
+rm -f temp_package/usr/share/pandora_server/bin/PandoraFMS
+
 ############################################
 
 
@@ -131,7 +135,7 @@ cp -aRf util/tentacle_serverd temp_package/etc/init.d/
 #~ 
 	#~ cp -R util temp_package/usr/share/pandora_server
 	cp -R DEBIAN temp_package/
-	chmod 777 -R temp_package/DEBIAN
+	chmod 755 -R temp_package/DEBIAN
 	
 	echo "Remove the SVN files and other temp files."
 	for item in `find temp_package`
@@ -180,8 +184,8 @@ cp -aRf util/tentacle_serverd temp_package/etc/init.d/
 
 	echo "Make the package \"Pandorafms server\"."
 	dpkg-deb --build temp_package
-	mv temp_package.deb pandorafms.server_$pandora_console_version.deb
-	chmod 777 pandorafms.server_$pandora_console_version.deb
+	mv temp_package.deb pandorafms.server_$pandora_version.deb
+	chmod 777 pandorafms.server_$pandora_version.deb
 fi
 
 if [ $package_cpan -eq 1 ]
@@ -202,4 +206,4 @@ then
 fi
 
 echo "Delete the \"temp_package\" temp dir for job."
-#rm -rf temp_package
+rm -rf temp_package
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 68e4862129..9a48b2b2dd 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,7 +2,7 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version	    3.1.0
+%define version     3.1rc1
 %define release     4
 
 Summary:            Pandora FMS Server