diff --git a/ChangeLog.mips b/ChangeLog.mips
index 0ca16cc546..a7a219e49d 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,4 +1,9 @@
-2008-03-27  Robin Randhawa  <robin@mips.com>
+2008-03-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h: Undefine
+	ARG_MAX if <linux/limits.h> has defined it.
+
+2008-03-28  Robin Randhawa  <robin@mips.com>
 
 	* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Added memory
 	barriers to enforce strict ordering on weakly ordered systems.
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h b/sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h
index 4c3f5f6788..c6fae63a5f 100644
--- a/sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h
+++ b/sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h
@@ -1,5 +1,5 @@
 /* Minimum guaranteed maximum values for system limits.  MIPS Linux version.
-   Copyright (C) 1993-1998,2000,2002,2003,2004,2007
+   Copyright (C) 1993-1998,2000,2002,2003,2004,2007,2008
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -32,6 +32,9 @@
 #ifndef OPEN_MAX
 # define __undef_OPEN_MAX
 #endif
+#ifndef ARG_MAX
+# define __undef_ARG_MAX
+#endif
 
 /* The kernel sources contain a file with all the needed information.  */
 #include <linux/limits.h>
@@ -51,6 +54,11 @@
 # undef OPEN_MAX
 # undef __undef_OPEN_MAX
 #endif
+/* Have to remove ARG_MAX?  */
+#ifdef __undef_ARG_MAX
+# undef ARG_MAX
+# undef __undef_ARG_MAX
+#endif
 
 /* The number of data keys per process.  */
 #define _POSIX_THREAD_KEYS_MAX	128