diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 093dbc625d..80224be2c5 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-08 Hirofumi Kosaka <kosaka@rworks.jp>
+
+	* util/tentacle_serverd: Tiny improvement. Changed to use
+	target process id to check if the process has been stopped.
+
 2013-04-08 Hirofumi Kosaka <kosaka@rworks.jp>
 
 	* util/pandora_server: Small improvement. Pinned target
diff --git a/pandora_server/util/tentacle_serverd b/pandora_server/util/tentacle_serverd
index bba4acc199..4e4947ac76 100755
--- a/pandora_server/util/tentacle_serverd
+++ b/pandora_server/util/tentacle_serverd
@@ -113,9 +113,9 @@ case "$1" in
 		else
 			kill $TENTACLE_PID
 			sleep 1
-			TENTACLE_PID=`get_pid`
+			_PID=`get_pid`
 
-			if [ ! -z "$TENTACLE_PID" ]; then
+			if [ "$_PID" = "$TENTACLE_PID" ]; then
 				echo "Tentacle Server could not be stopped"
 				rc_status -s
 			fi