diff --git a/ChangeLog b/ChangeLog
index 48f243df09..fdfdddde77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/posix/tempname.c: Use __xstat instead of __stat.
+	* sysdeps/unix/grantpt.c: Likewise.
+	* sysdeps/unix/sysv/linux/ptsname.c: Likewise.
+	* sysvipc/ftok.c: Likewise.
+	Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
+
 1998-12-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
  
 	* sysdeps/alpha/fpu/fsetexcptflg.c: Avoid -Wparentheses warning. 
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
index d49971db26..97a01d2b7e 100644
--- a/sysdeps/posix/tempname.c
+++ b/sysdeps/posix/tempname.c
@@ -33,7 +33,7 @@ static int
 direxists (const char *dir)
 {
   struct stat buf;
-  return __stat (dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+  return __xstat (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
 }
 
 /* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
@@ -161,7 +161,7 @@ __gen_tempname (char *tmpl, int openit, int largefile)
       else
 	{
 	  struct stat st;
-	  if (__stat (tmpl, &st) < 0)
+	  if (__xstat (_STAT_VER, tmpl, &st) < 0)
 	    {
 	      if (errno == ENOENT)
 		{
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index 76bda071e7..df155eb23e 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -109,7 +109,7 @@ grantpt (int fd)
   if (pts_name (fd, &buf, sizeof (_buf)))
     return -1;
 
-  if (__stat (buf, &st) < 0)
+  if (__xstat (_STAT_VER, buf, &st) < 0)
     goto cleanup;
 
   /* Make sure that we own the device.  */
diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index d852fb3658..5852e2b295 100644
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -123,7 +123,7 @@ __ptsname_r (int fd, char *buf, size_t buflen)
       p[2] = '\0';
     }
 
-  if (__stat (buf, &st) < 0)
+  if (__xstat (_STAT_VER, buf, &st) < 0)
     return errno;
 
   __set_errno (save_errno);
diff --git a/sysvipc/ftok.c b/sysvipc/ftok.c
index aaa20ee94a..b0199acda6 100644
--- a/sysvipc/ftok.c
+++ b/sysvipc/ftok.c
@@ -28,7 +28,7 @@ ftok (pathname, proj_id)
   struct stat st;
   key_t key;
 
-  if (__stat (pathname, &st) < 0)
+  if (__xstat (_STAT_VER, pathname, &st) < 0)
     return (key_t) -1;
 
   key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16)