diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c626c12c4..bbeaff93e1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	ARI fix: "strlen d_name" rule.
+	* linux-nat.c (linux_nat_xfer_osdata): Use NAMELEN macro.
+
+
 2009-03-24  Tom Tromey  <tromey@redhat.com>
 	    Pedro Alves  <pedro@codesourcery.com>
 
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 3cfc2b2228..be99ecea9b 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4163,7 +4163,7 @@ linux_nat_xfer_osdata (struct target_ops *ops, enum target_object object,
              char procentry[sizeof ("/proc/4294967295")];
 
              if (!isdigit (dp->d_name[0])
-                 || strlen (dp->d_name) > sizeof ("4294967295") - 1)
+                 || NAMELEN (dp) > sizeof ("4294967295") - 1)
                continue;
 
              sprintf (procentry, "/proc/%s", dp->d_name);