diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e470dca65..808795803 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-03  Till Straumann  <strauman@SLAC.Stanford.EDU>
+
+	* libc/time/tzset_r.c: Change local variables that are
+	set via sscanf using the %h format specifier to be unsigned short
+	instead of int.
+
 2003-05-30  Kelley Cook  <kelleycook@wideopenwest.com>
 
 	* configure.host:  Allow i[34567]86 variant.
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 9469028a4..ad8267d1b 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -28,7 +28,8 @@ _DEFUN (_tzset_r, (reent_ptr),
         struct _reent *reent_ptr)
 {
   char *tzenv;
-  int hh, mm, ss, sign, m, w, d, n;
+  unsigned short hh, mm, ss, m, w, d;
+  int sign, n;
   int i, ch;
 
   if ((tzenv = _getenv_r (reent_ptr, "TZ")) == NULL)