diff --git a/src/HttpClient.cpp b/src/HttpClient.cpp
index 7517eea..33ac681 100644
--- a/src/HttpClient.cpp
+++ b/src/HttpClient.cpp
@@ -542,7 +542,7 @@ bool HttpClient::endOfHeadersReached()
     return (iState == eReadingBody || iState == eReadingChunkLength || iState == eReadingBodyChunk);
 };
 
-int HttpClient::contentLength()
+long HttpClient::contentLength()
 {
     // skip the response headers, if they haven't been read already 
     if (!endOfHeadersReached())
diff --git a/src/HttpClient.h b/src/HttpClient.h
index 38fd799..b9f68f8 100644
--- a/src/HttpClient.h
+++ b/src/HttpClient.h
@@ -272,7 +272,7 @@ class HttpClient : public Client
       @return Length of the body, in bytes, or kNoContentLengthHeader if no
       Content-Length header was returned by the server
     */
-    int contentLength();
+    long contentLength();
 
     /** Returns if the response body is chunked
       @return true if response body is chunked, false otherwise
@@ -372,7 +372,7 @@ class HttpClient : public Client
     // Stores the status code for the response, once known
     int iStatusCode;
     // Stores the value of the Content-Length header, if present
-    int iContentLength;
+    long iContentLength;
     // How many bytes of the response body have been read by the user
     int iBodyLengthConsumed;
     // How far through a Content-Length header prefix we are