diff --git a/lib/http_digest.c b/lib/http_digest.c
index d06453e8af..cd224625ce 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -66,7 +66,7 @@ CURLdigest Curl_input_digest(struct connectdata *conn,
   struct SessionHandle *data=conn->data;
   bool before = FALSE; /* got a nonce before */
   struct digestdata *d;
-  
+
   if(proxy) {
     d = &data->state.proxydigest;
   }
@@ -168,7 +168,12 @@ CURLdigest Curl_input_digest(struct connectdata *conn,
         else {
           /* unknown specifier, ignore it! */
         }
-        totlen = strlen(value)+strlen(content)+3;
+        totlen = strlen(value)+strlen(content)+1;
+
+        if(header[strlen(value)+1] == '\"')
+          /* the contents were within quotes, then add 2 for them to the
+             length */
+          totlen += 2;
       }
       else
         break; /* we're done here */