diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 90b464d570..df34f29400 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -541,8 +541,17 @@ install () {
 	then
 		echo "Define 'pandora_agent=\"YES\"' in /etc/rc.conf to enable the daemon."
 	else
-		echo "Check your startup configuration to be sure Pandora FMS Agent is ready "
-		echo "to start automatically when system restarts":
+		# Enable startup service
+		if [ `command -v systemctl` ]
+		then
+			systemctl enable pandora_agent_daemon
+		elif [ `command -v chkconfig` ]
+		then
+			chkconfig pandora_agent_daemon on
+		else
+			echo "Check your startup configuration to be sure Pandora FMS Agent is ready "
+			echo "to start automatically when system restarts":
+		fi
 	fi
 
 	# Restore the daemon script