diff --git a/CHANGES b/CHANGES
index 73bf192d2..b2c251393 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,15 @@
                                   Changelog
 
 Daniel (22 June 2004)
+- David Cohen pointed out that RFC2109 says clients should allow cookies to
+  contain least 4096 bytes while libcurl only allowed 2047. I raised the limit
+  to 4999 now and made the used buffer get malloc()ed instead of simply
+  allocated on stack as before. Extended test case 46 to include a cookie with
+  very huge content to verify the fix.
+
+- Günter Knauf fixed getdate.y to remove a few warnings. I removed the
+  ifdef'ed test we never ever use anyway.
+
 - Gisle Vanem fixed the certificate wildcard checks to support a '*'-letter
   anywhere in the wildcard string, support multiple '*'-letters in the
   wildcard and to allow the '*'-letter to match a string that includes a dot.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fb4e1d82b..201ae726e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o cookies can now hold 4999 bytes of content
  o HTTP POST/PUT with NTLM/Digest/Negotiate to a URL returning 3XX
  o HTTPS POST/PUT over a proxy requiring NTLM/Digest/Negotiate works now
  o less restrictive libidn requirements, 0.4.1 or later is fine
@@ -45,6 +46,6 @@ advice from friends like these:
 
  Gisle Vanem, Vincent Bronner, Alexander Krasnostavsky, Chris Gaukroger,
  Günter Knauf, Marty Kuhrt, Kjetil Jacobsen, Steven Bazyl, Seshubabu Pasam,
- Luca Alteas, Jean-Louis Lemaire, David Byron
+ Luca Alteas, Jean-Louis Lemaire, David Byron, David Cohen
 
         Thanks! (and sorry if I forgot to mention someone)