diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
index e1e93cb..e2bfc15 100644
--- a/libcurl_http_fetcher.cc
+++ b/libcurl_http_fetcher.cc
@@ -27,7 +27,6 @@
 namespace chromeos_update_engine {
 
 namespace {
-const int kMaxRetriesCount = 3;
 const int kNoNetworkRetrySeconds = 10;
 const char kCACertificatesPath[] = "/usr/share/chromeos-ca-certificates";
 }  // namespace {}
@@ -214,6 +213,8 @@
   transfer_size_ = -1;
   resume_offset_ = 0;
   retry_count_ = 0;
+  max_retry_count_ = (utils::IsOOBEComplete()) ? kMaxRetryCountOobeComplete
+                                               : kMaxRetryCountOobeNotComplete;
   no_network_retry_count_ = 0;
   http_response_code_ = 0;
   terminate_requested_ = false;
@@ -306,15 +307,19 @@
           delegate_->TransferComplete(this, false);  // signal fail
       }
     } else if ((transfer_size_ >= 0) && (bytes_downloaded_ < transfer_size_)) {
-      // Need to restart transfer
       retry_count_++;
-      LOG(INFO) << "Restarting transfer b/c we finished, had downloaded "
-                << bytes_downloaded_ << " bytes, but transfer_size_ is "
-                << transfer_size_ << ". retry_count: " << retry_count_;
-      if (retry_count_ > kMaxRetriesCount) {
+      LOG(INFO) << "Transfer interrupted after downloading "
+                << bytes_downloaded_ << " of " << transfer_size_ << " bytes. "
+                << transfer_size_ - bytes_downloaded_ << " bytes remaining "
+                << "after " << retry_count_ << " attempt(s)";
+
+      if (retry_count_ > max_retry_count_) {
+        LOG(INFO) << "Reached max attempts (" << retry_count_ << ")";
         if (delegate_)
           delegate_->TransferComplete(this, false);  // signal fail
       } else {
+        // Need to restart transfer
+        LOG(INFO) << "Restarting transfer to download the remaining bytes";
         g_timeout_add_seconds(retry_seconds_,
                               &LibcurlHttpFetcher::StaticRetryTimeoutCallback,
                               this);
diff --git a/libcurl_http_fetcher.h b/libcurl_http_fetcher.h
index 4fc65b2..7b9f12c 100644
--- a/libcurl_http_fetcher.h
+++ b/libcurl_http_fetcher.h
@@ -24,6 +24,8 @@
 class LibcurlHttpFetcher : public HttpFetcher {
  public:
   static const int kMaxRedirects = 10;
+  static const int kMaxRetryCountOobeComplete = 20;
+  static const int kMaxRetryCountOobeNotComplete = 3;
 
   explicit LibcurlHttpFetcher(ProxyResolver* proxy_resolver)
       : HttpFetcher(proxy_resolver),
@@ -37,6 +39,7 @@
         download_length_(0),
         resume_offset_(0),
         retry_count_(0),
+        max_retry_count_(kMaxRetryCountOobeNotComplete),
         retry_seconds_(20),
         no_network_retry_count_(0),
         no_network_max_retries_(0),
@@ -223,8 +226,9 @@
   // not to resuming an interrupted download.
   off_t resume_offset_;
 
-  // Number of resumes performed.
+  // Number of resumes performed so far and the max allowed.
   int retry_count_;
+  int max_retry_count_;
 
   // Seconds to wait before retrying a resume.
   int retry_seconds_;