diff --git a/ChangeLog b/ChangeLog
index cbc558bf..f7f0f08a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-31  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that downloading > 4GB file fails on 32bit systems.
+	* src/HttpRequest.cc
+	* src/HttpRequestCommand.cc
+
 2010-10-30  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use unnamed namespace instead of static keyword.
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index ea49d93a..b2725066 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -59,7 +59,7 @@ HttpRequest::HttpRequest():contentEncodingEnabled_(true),
                            userAgent_(USER_AGENT),
                            noCache_(true),
                            acceptGzip_(false),
-                           endOffsetOverride_(false)
+                           endOffsetOverride_(0)
 {}
 
 void HttpRequest::setSegment(const SharedHandle<Segment>& segment)
diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc
index 6bea5f84..91a7d4b4 100644
--- a/src/HttpRequestCommand.cc
+++ b/src/HttpRequestCommand.cc
@@ -188,7 +188,8 @@ bool HttpRequestCommand::executeInternal() {
               getPieceStorage()->getNextUsedIndex(segment->getIndex());
             endOffset = std::min
               (static_cast<off_t>(getFileEntry()->getLength()),
-               getFileEntry()->gtoloff(segment->getSegmentLength()*nextIndex));
+               getFileEntry()->gtoloff
+               (static_cast<off_t>(segment->getSegmentLength())*nextIndex));
           }
           SharedHandle<HttpRequest> httpRequest
             (createHttpRequest(getRequest(),