diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index da8f6d120..5936bdfc3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-01  Corinna Vinschen  <corinna@vinschen.de>
+	    Brian Dessent <brian@dessent.net>
+
+	* Makefile.in (OBSOLETE_FUNCTIONS): Add timezone.
+	* include/cygwin/time.h: Drop conditional timezone definitions.
+	(timezone): Declare as extern symbol referring _timezone variable.
+
 2007-11-28  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_tape.cc (mtinfo::initialize): Use MAX_PATH instead of
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 82215a527..68dc5b35e 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -158,7 +158,7 @@ OBSOLETE_FUNCTIONS:=regcomp regerror regexec regfree regsub \
 		    getgroups getpwuid getpwuid_r getuid initgroups \
 		    lchown lseek lstat mknod mmap seekdir setegid seteuid \
 		    setgid setgroups setregid setreuid setuid stat \
-		    telldir tmpfile truncate
+		    telldir tmpfile truncate timezone
 
 NEW_FUNCTIONS:=regcomp posix_regcomp \
 	       regerror posix_regerror \
diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h
index 2f84505f5..50ec87dac 100644
--- a/winsup/cygwin/include/cygwin/time.h
+++ b/winsup/cygwin/include/cygwin/time.h
@@ -29,13 +29,8 @@ time_t __cdecl timegm (struct tm *);
 #   define daylight _daylight
 # endif
 
-/* The timezone function is only kept for backward compatibility.
-   POSIX expects the timezone variable as XSI extension. */
-# ifdef __timezonefunc__
-char __cdecl *timezone (void);
-# elif !defined(timezone)
-#   define timezone _timezone
-# endif
+extern long timezone __asm__ ("__timezone");
+
 #endif /*__STRICT_ANSI__*/
 
 #ifdef __cplusplus