diff --git a/ChangeLog b/ChangeLog
index da9b6e21e..749e6d692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-15  Pavel Roskin  <proski@gnu.org>
+
+	* acinclude.m4 (AC_SHORT_D_NAME_LEN): Remove, this test is now
+	done at runtime.
+	* configure.in: Don't use AC_SHORT_D_NAME_LEN.
+
 2002-08-14  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* doc/ru/mc.1.in: Remove reference to README.edit.
diff --git a/acinclude.m4 b/acinclude.m4
index 952211752..5028b59f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -244,45 +244,6 @@ AC_MSG_RESULT([$av_struct_linger])
 ])
 
 
-
-dnl
-dnl Check for size of d_name dirent member
-dnl
-AC_DEFUN([AC_SHORT_D_NAME_LEN], [
-AC_MSG_CHECKING([filename fits on dirent.d_name])
-AC_CACHE_VAL(ac_cv_dnamesize, [
-OCFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$srcdir"
-AC_TRY_RUN([
-#include <src/fs.h>
-
-int main ()
-{
-   struct dirent ddd;
-
-   if (sizeof (ddd.d_name) < 12)
-	return 0;
-   else
-   	return 1; 
-}
-
-],[
-    ac_cv_dnamesize="no"
-], [
-    ac_cv_dnamesize="yes"
-], [
-# Cannot find out, so assume no
-    ac_cv_dnamesize="no"
-])
-CFLAGS="$OCFLAGS"
-])
-if test x$ac_cv_dnamesize = xno; then
-    AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER, 1,
-	      [Define if using `struct dirent' can overwrite stack])
-fi
-AC_MSG_RESULT([$ac_cv_dnamesize])
-])
-
 dnl
 dnl Filesystem information detection
 dnl
diff --git a/configure.in b/configure.in
index 7871cb132..8b6ccf597 100644
--- a/configure.in
+++ b/configure.in
@@ -104,7 +104,6 @@ AC_CHECK_HEADERS([unistd.h string.h memory.h crypt.h grp.h limits.h \
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
-AC_SHORT_D_NAME_LEN
 AC_HEADER_STDC
 
 dnl Missing structure components