diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3a29be76e..3d3ea9b01 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-01  Corinna Vinschen  <corinna@vinschen.de>
+
+	* localtime.cc (tzsetwall): Don't set TZ.
+
 2007-08-01  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Drop
diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc
index b8b1a6013..1dab62793 100644
--- a/winsup/cygwin/localtime.cc
+++ b/winsup/cygwin/localtime.cc
@@ -1456,7 +1456,11 @@ tzsetwall P((void))
 		settzname();
 		lcl_is_set = 1;
 		strlcpy(lcl_TZname, buf, sizeof (lcl_TZname));
+#if 0
+		/* Huh?  POSIX doesn't mention anywhere that tzset should
+		   set $TZ.  That's not right. */
 		setenv("TZ", lcl_TZname, 1);
+#endif
 		return;
 	    }
 	}