diff --git a/src/kits/network/libnetapi/UrlProtocolHttp.cpp b/src/kits/network/libnetapi/UrlProtocolHttp.cpp
index 1aa6aa266d..4eb2b5c8ae 100644
--- a/src/kits/network/libnetapi/UrlProtocolHttp.cpp
+++ b/src/kits/network/libnetapi/UrlProtocolHttp.cpp
@@ -508,6 +508,10 @@ BUrlProtocolHttp::_MakeRequest()
 				if ((fContext != NULL) && fHeaders.HasHeader("Set-Cookie")) {
 					for (int32 i = 0;  i < fHeaders.CountHeaders(); i++) {
 						if (fHeaders.HeaderAt(i).NameIs("Set-Cookie")) {
+							BNetworkCookie* cookie = new BNetworkCookie();
+							cookie->ParseCookieStringFromUrl(
+								fHeaders.HeaderAt(i).Value(), fUrl);
+							fContext->GetCookieJar().AddCookie(cookie);
 						}
 					}
 				}
diff --git a/src/kits/network/libnetapi/UrlRequest.cpp b/src/kits/network/libnetapi/UrlRequest.cpp
index 4b30359994..bf139ce922 100644
--- a/src/kits/network/libnetapi/UrlRequest.cpp
+++ b/src/kits/network/libnetapi/UrlRequest.cpp
@@ -69,6 +69,9 @@ void
 BUrlRequest::SetContext(BUrlContext* context)
 {
 	fContext = context;
+
+	if (fUrlProtocol != NULL)
+		fUrlProtocol->SetContext(context);
 }