diff --git a/ChangeLog b/ChangeLog
index fc36d99f..8237ce05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Made DEFAULT_ANNOUNCE_INTERVAL 120, so that if first tracker request
+	attempt is failed, then 2nd attempt get kicked out more quickly.
+	And it is now static const member of DefaultBtAnnounce.
+	* src/DefaultBtAnnounce.h
+
 2008-06-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Renamed BtRuntime::lessThanMinPeers() and BtRuntime::lessThanEqMinPeers.
diff --git a/src/DefaultBtAnnounce.h b/src/DefaultBtAnnounce.h
index 488e041e..40ce0c0a 100644
--- a/src/DefaultBtAnnounce.h
+++ b/src/DefaultBtAnnounce.h
@@ -41,8 +41,6 @@
 
 namespace aria2 {
 
-#define DEFAULT_ANNOUNCE_INTERVAL 1800
-
 class BtContext;
 class Option;
 class Logger;
@@ -69,6 +67,9 @@ private:
   SharedHandle<BtRuntime> btRuntime;
   SharedHandle<PieceStorage> pieceStorage;
   SharedHandle<PeerStorage> peerStorage;
+
+  static const unsigned int DEFAULT_ANNOUNCE_INTERVAL = 120;
+
 public:
   DefaultBtAnnounce(const SharedHandle<BtContext>& btContext,
 		    const Option* option);