diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 16282e01f..73e4795f8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-09  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId
+	since it's actually right here.
+	* fhandler_disk_file.cc: Accommodate above change.
+
 2015-12-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* thread.cc (pthread::setcancelstate): Remove unnecessary locking.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 178cafa65..0567a1352 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -494,7 +494,7 @@ fhandler_base::fstat_by_name (struct stat *buf)
 	    debug_printf ("%y = NtQueryDirectoryFile(%S)", status,
 			  pc.get_nt_native_path ());
 	  else
-	    ino = fdi_buf.fdi.IndexNumber.QuadPart;
+	    ino = fdi_buf.fdi.FileId.QuadPart;
 	}
     }
   return fstat_helper (buf, 1);
@@ -2339,7 +2339,7 @@ go_ahead:
 	  FileNameLength = buf->FileNameLength;
 	  FileAttributes = buf->FileAttributes;
 	  if ((dir->__flags & dirent_set_d_ino))
-	    de->d_ino = buf->IndexNumber.QuadPart;
+	    de->d_ino = buf->FileId.QuadPart;
 	}
       else if ((dir->__flags & dirent_nfs_d_ino))
 	{
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 7119c1a9e..5cc7c46f7 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -265,7 +265,7 @@ typedef struct _FILE_ID_BOTH_DIR_INFORMATION
   ULONG  EaSize;
   CCHAR  ShortNameLength;
   WCHAR  ShortName[12];
-  LARGE_INTEGER  IndexNumber;
+  LARGE_INTEGER  FileId;
   WCHAR  FileName[1];
 } FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION;