diff --git a/ChangeLog b/ChangeLog
index 8237ce05..9df67f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-06  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Use interval as a minInterval when minInterval is not supplied.
+	* src/DefaultBtAnnounce.cc
+
 2008-06-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Made DEFAULT_ANNOUNCE_INTERVAL 120, so that if first tracker request
diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc
index aff5851c..d7047b2f 100644
--- a/src/DefaultBtAnnounce.cc
+++ b/src/DefaultBtAnnounce.cc
@@ -238,8 +238,11 @@ DefaultBtAnnounce::processAnnounceResponse(const unsigned char* trackerResponse,
       minInterval = minIntervalData->toInt();
       logger->debug("Min interval:%d", minInterval);
     }
-  }
-  if(minInterval > interval) {
+    if(minInterval > interval) {
+      minInterval = interval;
+    }
+  } else {
+    // Use interval as a minInterval if minInterval is not supplied.
     minInterval = interval;
   }
   const Data* completeData =