diff --git a/ChangeLog b/ChangeLog
index e0c86091..1bd32f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2008-02-16  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+2008-02-18  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Use raw message digest as a token instead of its hexadecimal
+	representation.
+	* src/DHTTokenTracker.cc (generateToken)
+
+2008-02-17  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Added Message Stream Encryption(MSE) support.
 	Currently, aria2 accepts incoming connections with Obfuscation Header
diff --git a/src/DHTTokenTracker.cc b/src/DHTTokenTracker.cc
index 60bec983..70d7301d 100644
--- a/src/DHTTokenTracker.cc
+++ b/src/DHTTokenTracker.cc
@@ -67,7 +67,9 @@ std::string DHTTokenTracker::generateToken(const unsigned char* infoHash,
   }
   memcpy(src, infoHash, DHT_ID_LENGTH);
   memcpy(src+DHT_ID_LENGTH+6, secret, SECRET_SIZE);
-  return MessageDigestHelper::digest("sha1", src, sizeof(src));
+  unsigned char md[20];
+  MessageDigestHelper::digest(md, sizeof(md), "sha1", src, sizeof(src));
+  return std::string(&md[0], &md[sizeof(md)]);
 }
 
 std::string DHTTokenTracker::generateToken(const unsigned char* infoHash,