diff --git a/ChangeLog b/ChangeLog
index 1d7777d..37251fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 26 01:04:34 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Use kernel dirent structure for Linux
+
 Sun May  9 02:18:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Merge in patches from Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
diff --git a/file.c b/file.c
index 63a7cce..199ecd5 100644
--- a/file.c
+++ b/file.c
@@ -32,6 +32,14 @@
 #include "defs.h"
 
 #include <dirent.h>
+#ifdef linux
+#define dirent kernel_dirent
+#include <linux/types.h>
+#include <linux/dirent.h>
+#undef dirent
+#else
+#define kernel_dirent dirent
+#endif
 
 #ifdef linux
 #  include <asm/stat.h>
@@ -1247,7 +1255,7 @@
 	if (!abbrev(tcp))
 		tprintf("{");
 	for (i = 0; i < len;) {
-		struct dirent *d = (struct dirent *) &buf[i];
+		struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
 #ifdef linux
 		if (!abbrev(tcp)) {
 			tprintf("%s{d_ino=%lu, d_off=%lu, ",