diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 361f8e9d54..e6b9e33d5d 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-09  Junichi Satoh <junichi@rworks.jp>
+
+	* FreeBSD/tentacle_server: Changed how to get pid of tentacle_server
+	strictly. Updated year.
+
 2012-11-30  Hirofumi Kosaka <kosaka@rworks.jp>
 
 	* lib/PandoraFMS/SNMPServer.pm: Added missing safe_output()
diff --git a/pandora_server/FreeBSD/tentacle_server b/pandora_server/FreeBSD/tentacle_server
index e811aa6335..45dbaca13a 100755
--- a/pandora_server/FreeBSD/tentacle_server
+++ b/pandora_server/FreeBSD/tentacle_server
@@ -2,7 +2,7 @@
 
 # **********************************************************************
 # Tentacle Server Daemon launcher for FreeBSD
-# (c) 2010 Junichi Satoh <junichi@rworks.jp>
+# (c) 2010-2012 Junichi Satoh <junichi@rworks.jp>
 #
 # **********************************************************************
 
@@ -38,7 +38,7 @@ procname="/usr/bin/perl"
 
 start_postcmd()
 {
-	TENTACLE_PID=`pgrep -f -j none $name`
+	TENTACLE_PID=`pgrep -f -j none "$procname $command"`
 	echo $TENTACLE_PID > $pidfile
 }