diff --git a/ChangeLog b/ChangeLog
index 26459419e4..c14bcfb444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2000-06-17  Ulrich Drepper  <drepper@redhat.com>
 
-	* sysdeps/unix/sysv/linux/alpha/pathconf.c: Define LINK_MAX.
+	* sysdeps/unix/sysv/linux/alpha/fpathconf.c: Define and use
+	LINUX_LINK_MAX.
+	* sysdeps/unix/sysv/linux/alpha/pathconf.c: Likewise.
 
 	* locale/programs/ld-ctype.c (ctype_output): Really write out
 	mboutdigits information.
diff --git a/sysdeps/unix/sysv/linux/alpha/fpathconf.c b/sysdeps/unix/sysv/linux/alpha/fpathconf.c
index b822daaf39..235c02c8f8 100644
--- a/sysdeps/unix/sysv/linux/alpha/fpathconf.c
+++ b/sysdeps/unix/sysv/linux/alpha/fpathconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,6 +24,10 @@
 
 #include <linux_fsinfo.h>
 
+
+/* The Linux kernel header mentioned this as a kind of generic value.  */
+#define LINUX_LINK_MAX	127
+
 static long int default_fpathconf (int fd, int name);
 
 /* Get file-specific information about descriptor FD.  */
@@ -60,7 +64,7 @@ __fpathconf (fd, name)
       /* Determine the filesystem type.  */
       if (__fstatfs (fd, &fsbuf) < 0)
 	/* not possible, return the default value.  */
-	return LINK_MAX;
+	return LINUX_LINK_MAX;
 
       switch (fsbuf.f_type)
 	{
@@ -90,7 +94,7 @@ __fpathconf (fd, name)
 	  return UFS_LINK_MAX;
 
 	default:
-	  return LINK_MAX;
+	  return LINUX_LINK_MAX;
 	}
     }
 
diff --git a/sysdeps/unix/sysv/linux/alpha/pathconf.c b/sysdeps/unix/sysv/linux/alpha/pathconf.c
index df5d72ab5e..be5e938783 100644
--- a/sysdeps/unix/sysv/linux/alpha/pathconf.c
+++ b/sysdeps/unix/sysv/linux/alpha/pathconf.c
@@ -57,7 +57,7 @@ __pathconf (const char *path, int name)
       /* Determine the filesystem type.  */
       if (__statfs (path, &fsbuf) < 0)
 	/* not possible, return the default value.  */
-	return LINK_MAX;
+	return LINUX_LINK_MAX;
 
       switch (fsbuf.f_type)
 	{
@@ -87,7 +87,7 @@ __pathconf (const char *path, int name)
 	  return UFS_LINK_MAX;
 
 	default:
-	  return LINK_MAX;
+	  return LINUX_LINK_MAX;
 	}
     }