diff --git a/ChangeLog b/ChangeLog
index 2ef2034819..5ebef7bc3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,30 @@
-1998-10-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
- 
-	* rt/aio.h: Move __aio_init to... 
-	* include/aio.h: ...here. 
-         
-1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
- 
-	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Remove duplicate 
-	definition of O_LARGEFILE. 
- 
-1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
- 
-	* sysdeps/unix/sysv/linux/alpha/pathconf.c (__pathconf): Use path 
-	as first argument to statfs. 
- 
-1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
- 
-	* sysdeps/generic/setenv.c (setenv): Add braces around ambiguous else. 
- 
-1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
- 
-	* malloc/mtrace.c: Include <string.h> for strlen. 
- 
+1998-10-24  H.J. Lu  <hjl@gnu.org>
+
+	* time/tzfile.c (__tzfile_default): Set num_types to 2.
+
+1998-10-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* rt/aio.h: Move __aio_init to...
+	* include/aio.h: ...here.
+
+1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Remove duplicate
+	definition of O_LARGEFILE.
+
+1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/unix/sysv/linux/alpha/pathconf.c (__pathconf): Use path
+	as first argument to statfs.
+
+1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sysdeps/generic/setenv.c (setenv): Add braces around ambiguous else.
+
+1998-10-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* malloc/mtrace.c: Include <string.h> for strlen.
+
 1998-10-24  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* sysdeps/mach/hurd/bits/environments.h: New file.
diff --git a/sysdeps/mach/hurd/i386/bits/environments.h b/sysdeps/mach/hurd/i386/bits/environments.h
deleted file mode 100644
index 5f7dcd14e6..0000000000
--- a/sysdeps/mach/hurd/i386/bits/environments.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _UNISTD_H
-# error "Never include this file directly.  Use <unistd.h> instead"
-#endif
-
-/* By default we have 32-bit wide `int', `long int', pointers and `off_t'.  */
-#define _XBS5_ILP32_OFF32	1
-
-/* The Hurd does not yet implement an environment with the above size
-   but an 64-bit size `off_t'.  */
-#define _XBS5_ILP32_OFFBIG	-1
-
-/* We can never provide environments with 64-bit wide pointers.  */
-#define _XBS5_LP64_OFF64	-1
-#define _XBS5_LPBIG_OFFBIG	-1
diff --git a/time/tzfile.c b/time/tzfile.c
index a7753d2f73..7c72aad103 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -343,6 +343,9 @@ __tzfile_default (const char *std, const char *dst,
     }
   __mempcpy (__mempcpy (zone_names, std, stdlen), dst, dstlen);
 
+  /* Now there are only two zones, regardless of what the file contained.  */
+  num_types = 2;
+
   /* Now correct the transition times for the user-specified standard and
      daylight offsets from GMT.  */
   isdst = 0;