diff --git a/ChangeLog b/ChangeLog
index 7c4496e0..c5b63cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-02  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Possible fix for chunked encoding with Content-Length.
+	* src/HttpResponseCommand.cc
+
 2010-04-02  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Don't send "Accept: default, gzip" by default. This is because
diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc
index 5a49881d..33b7c4ed 100644
--- a/src/HttpResponseCommand.cc
+++ b/src/HttpResponseCommand.cc
@@ -252,7 +252,8 @@ bool HttpResponseCommand::handleDefaultEncoding
     if(req->getMethod() == Request::METHOD_GET &&
        !segment.isNull() && segment->getPositionToWrite() == 0 &&
        !req->isPipeliningEnabled()) {
-      command = createHttpDownloadCommand(httpResponse);
+      command = createHttpDownloadCommand
+        (httpResponse, getTransferEncodingDecoder(httpResponse));
     } else {
       _requestGroup->getSegmentMan()->cancelSegment(cuid);
       _fileEntry->poolRequest(req);