diff --git a/ChangeLog b/ChangeLog
index 5d5bd9e746..dfa2951bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-23  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/posix/shm_open.c (SHMDIR): /var/run/shm -> /dev/shm
+	* sysdeps/posix/shm_unlink.c: Likewise.
+
 2002-03-22  Roland McGrath  <roland@frob.com>
 
 	* shlib-versions [USE_IN_LIBIO] (.*-.*-gnu-gnu.*): Make 2.2.6 default.
diff --git a/sysdeps/posix/shm_open.c b/sysdeps/posix/shm_open.c
index eab5ee342e..b773d40db0 100644
--- a/sysdeps/posix/shm_open.c
+++ b/sysdeps/posix/shm_open.c
@@ -1,5 +1,5 @@
 /* shm_open -- open a POSIX shared memory object.  Generic POSIX file version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001,02 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
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <paths.h>
 
-#define SHMDIR	(_PATH_VARRUN "shm/")
+#define SHMDIR	(_PATH_DEV "shm/")
 
 /* Open shared memory object.  */
 int
diff --git a/sysdeps/posix/shm_unlink.c b/sysdeps/posix/shm_unlink.c
index 79f6751ebd..b67240f838 100644
--- a/sysdeps/posix/shm_unlink.c
+++ b/sysdeps/posix/shm_unlink.c
@@ -1,5 +1,5 @@
 /* shm_unlink -- remove a POSIX shared memory object.  Generic POSIX version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001,02 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
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <paths.h>
 
-#define SHMDIR	(_PATH_VARRUN "shm/")
+#define SHMDIR	(_PATH_DEV "shm/")
 
 /* Remove shared memory object.  */
 int
@@ -55,7 +55,6 @@ shm_unlink (const char *name)
   __mempcpy (__mempcpy (fname, SHMDIR, sizeof SHMDIR - 1),
 	     name, namelen + 1);
 
-
   return unlink (name);
 }