diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 858c49b1a..730b52338 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/ddk/ntifs.h (FILE_ID_FULL_DIRECTORY_INFORMATION): Add filler
+	value to force correct alignment.
+
 2006-02-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/commctrl.h (LPNMLVCACHEHINT): Correct spelling.
diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h
index 4737a4254..ae1ca94a4 100644
--- a/winsup/w32api/include/ddk/ntifs.h
+++ b/winsup/w32api/include/ddk/ntifs.h
@@ -952,6 +952,7 @@ typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION {
 		ULONG           FileAttributes;
 		ULONG           FileNameLength;
 		ULONG           EaSize;
+		ULONG           __filler;
 		LARGE_INTEGER   FileId;
 		WCHAR           FileName[0];
 } FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION;