diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index eebbafb0a1..acd8388c53 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-10  Manuel Arostegui <manuel@todo-linux.com>
+
+	* pandora_server.spec: Changed the architecture, changed the
+	release, the "_" was a mistake.
+
+	* pandora_server: Added chkconfig handling.
+
 2009-07-09  Manuel Arostegui <manuel@todo-linux.com>
 
 	* pandora_server.spec: Removed unnecessary dependency.
diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server
index 8d325d8ad2..38d96d1305 100755
--- a/pandora_server/pandora_server
+++ b/pandora_server/pandora_server
@@ -5,6 +5,8 @@
 # Linux Version (generic)
 # v2.1 Build 081030
 # http://www.pandorafms.com
+# chkconfig: 23 99 99
+# description: Manages starting/stopping of server
 
 # Configurable path and filenames
 PANDORA_HOME="/etc/pandora/pandora_server.conf"
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 607a52ccf0..f7c3e18fa8 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        PandoraFMS_Server
 %define version	    3.0.0
-%define release     1_
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -17,7 +17,7 @@ Group:              System/Monitoring
 Packager:           Manuel Arostegui <marostegui@artica.es>
 Prefix:             /usr/share
 BuildRoot:          %{_tmppath}/%{name}-buildroot
-BuildArchitectures: i386 
+BuildArchitectures: noarch 
 %if "%{_vendor}" == "suse"
 Requires:           perl-XML-Simple perl-DateManip perl-Net-SNMP
 %endif