diff --git a/ChangeLog b/ChangeLog
index f1d9af18..de9091f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Updated debug log message
+	* src/AbstractCommand.cc
+	* src/message.h
+
 2009-07-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Avoid to create zombie process when commands specified in
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index a836fbc4..28c0e1f7 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -240,9 +240,13 @@ void AbstractCommand::tryReserved() {
     // and there are no URI left. Because file length is unknown, we
     // can assume that there are no in-flight request object.
     if(entry->getLength() == 0 && entry->getRemainingUris().empty()) {
+      logger->debug("CUID#%d - Not trying next request."
+		    " No reserved/pooled request is remaining and"
+		    " total length is still unknown.", cuid);
       return;
     }
   }
+  logger->debug("CUID#%d - Trying reserved/pooled request.", cuid);
   Commands commands;
   _requestGroup->createNextCommand(commands, e, 1);
   e->setNoWait(true);
@@ -284,8 +288,7 @@ void AbstractCommand::onAbort() {
     _fileEntry->removeRequest(req);
   }
 
-  logger->debug(MSG_UNREGISTER_CUID, cuid);
-  //_segmentMan->unregisterId(cuid);
+  logger->debug("CUID#%d - Aborting download", cuid);
   if(!_requestGroup->getPieceStorage().isNull()) {
     _requestGroup->getSegmentMan()->cancelSegment(cuid);
   }
diff --git a/src/message.h b/src/message.h
index 64465764..227e70f1 100644
--- a/src/message.h
+++ b/src/message.h
@@ -48,7 +48,6 @@
 #define MSG_RESTARTING_DOWNLOAD _("CUID#%d - Restarting the download. URI=%s")
 #define MSG_TORRENT_DOWNLOAD_ABORTED _("CUID#%d - Download aborted.")
 #define MSG_MAX_TRY _("CUID#%d - %d times attempted, but no success. Download aborted.")
-#define MSG_UNREGISTER_CUID _("CUID#%d - Unregistering cuid from segmentManager.")
 #define MSG_SEND_PEER_MESSAGE "CUID#%d - To: %s:%d %s"
 #define MSG_SEND_PEER_MESSAGE_WITH_INDEX "CUID#%d - To: %s:%d %s index=%d"
 #define MSG_SEND_PEER_MESSAGE_WITH_BITFIELD "CUID#%d - To: %s:%d %s %s"