diff --git a/CHANGES b/CHANGES
index e843b44679e4560386aa6e7ab6d98667a84e659a..434266ca6e1fcc5e78f13a8a8d97993aaa9d3ea1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,13 @@
                                   Changelog
 
 
+Daniel (5 July 2005)
+- Gisle Vanem came up with a nice little work-around for bug #1230118. It
+  seems the Windows (MSVC) libc time functions may return data one hour off if
+  TZ is not set and automatic DST adjustment is enabled. This made
+  curl_getdate() return wrong value, and it also concerned internal cookie
+  expirations etc.
+
 Daniel (4 July 2005)
 - Andrew Bushnell provided enough info for me to tell that we badly needed to
   fix the CONNECT authentication code with multi-pass auth methods (such as
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fad14e48f697e7ae29fa73035e7777e9a277a4f5..45406badd03ada9b6714d4e55db0950bb911cf32 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o corrected date parsing on Windows with auto-DST-adjust enabled
  o treats CONNECT 407 responses with bodies better during Digest/NTLM auth
  o improved strerror_r() API guessing when cross-compiling
  o debug builds work on Tru64
@@ -40,6 +41,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  John McGowan, Georg Wicherski, Andres Garcia, Eric Cooper, Todd Kulesza,
- Tupone Alfredo, Gisle Vanem, David Shaw, Andrew Bushnell
+ Tupone Alfredo, Gisle Vanem, David Shaw, Andrew Bushnell, Dan Fandrich
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 52529848d3d301a256a3991fa50d9c379a53860a..ae9e232a94a8598978635fe47390c2384f3ec2e8 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -236,9 +236,20 @@ static time_t Curl_parsedate(const char *date)
   struct tm tm;
   enum assume dignext = DATE_MDAY;
   const char *indate = date; /* save the original pointer */
-
   int part = 0; /* max 6 parts */
 
+#ifdef WIN32
+  /*
+   * On Windows, we need an odd work-around for the case when no TZ variable
+   * is set. If it isn't set and "automatic DST adjustment" is enabled, the
+   * time functions below will return values one hour off! As reported and
+   * investigated in bug report #1230118.
+  */
+  const char *env = getenv("TZ");
+  if(!env)
+    putenv("TZ=GMT");
+#endif
+
   while(*date && (part < 6)) {
     bool found=FALSE;