diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index b024725fc6..e9dcacae60 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Junichi Satoh  <junichi@rworks.jp>
+
+	* unix/pandora_agent_installer: Set execute bit to startup script
+	for FreeBSD.
+
 2010-06-09  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* unix/DEBIAN/make_deb_package.sh: added the code to include the man pages
diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 6035115407..68b7426b94 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Junichi Satoh  <junichi@rworks.jp>
+
+	* pandora_agent_installer: Set execute bit to startup script for
+	FreeBSD.
+
 2010-06-09  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Improved OS version detection. Disabled error output
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 092c1f9973..98a86bf5b1 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -354,6 +354,8 @@ install () {
 	then
 	PANDORA_STARTUP=/usr/local/etc/rc.d/pandora_agent
 		cp FreeBSD/pandora_agent $PANDORA_STARTUP
+		chmod 555 $PANDORA_STARTUP
+		chown root:wheel $PANDORA_STARTUP
 	fi
 
 	echo "Installing the Pandora Agent and Tentacle Client manuals"