diff --git a/src/ChangeLog b/src/ChangeLog
index 135969d183f..8f2c832b3ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-02  Gerd Moellmann  <gerd@gnu.org>
 
+	* editfns.c (Fcurrent_time_zone) [HAVE_TM_ZONE || HAVE_TZNAME]: 
+	Accept only alphanumeric time zone names.
+
 	* xterm.c (XTset_vertical_scroll_bar): Don't clear a zero height
 	or width area.
 	(XTset_vertical_scroll_bar, x_scroll_bar_create): Don't configure
diff --git a/src/editfns.c b/src/editfns.c
index 2f5e3f711ea..d8f03114b4e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1757,6 +1757,20 @@ the data it can't find.")
 	s = tzname[t->tm_isdst];
 #endif
 #endif /* not HAVE_TM_ZONE */
+
+#if defined HAVE_TM_ZONE || defined HAVE_TZNAME
+      if (s)
+	{
+	  /* On Japanese w32, we can get a Japanese string as time
+	     zone name.  Don't accept that.  */
+	  char *p;
+	  for (p = s; *p && isalnum (*p); ++p)
+	    ;
+	  if (p == s || *p)
+	    s = NULL;
+	}
+#endif
+
       if (!s)
 	{
 	  /* No local time zone name is available; use "+-NNNN" instead.  */