diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ad7259b24..838169265 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-10  Christopher Faylor  <cgf@redhat.com>
+
+	* libc/sys/cygwin/sys/dirent.h (struct dirent): Accommodate (slightly)
+	64 bit inodes.
+
 2003-05-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/include/sys/config.h: Remove all Cygwin specific configuration.
diff --git a/newlib/libc/sys/cygwin/sys/dirent.h b/newlib/libc/sys/cygwin/sys/dirent.h
index 810d8592c..486642df8 100644
--- a/newlib/libc/sys/cygwin/sys/dirent.h
+++ b/newlib/libc/sys/cygwin/sys/dirent.h
@@ -13,17 +13,19 @@
 
 #include <sys/types.h>
 
-#define __DIRENT_VERSION	1
+#define __DIRENT_VERSION	2
 
+#pragma pack(push,4)
 struct dirent
 {
   long d_version;	/* Used since Cygwin 1.3.3. */
-  long __d_reserved[2];
+  ino_t d_ino;		/* still junk but with more bits */
   long d_fd;		/* File descriptor of open directory.
 			   Used since Cygwin 1.3.3. */
-  ino_t d_ino;		/* Just for compatibility, it's junk */
+  unsigned long old_d_ino;/* Just for compatibility, it's junk */
   char d_name[256];	/* FIXME: use NAME_MAX? */
 };
+#pragma pack(pop)
 
 #define __DIRENT_COOKIE 0xdede4242