diff --git a/ChangeLog b/ChangeLog
index 4a902c527c..d1929eed4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-29  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #5939]
+	* sysdeps/posix/tempname.c (__gen_tempname): Correct flag selection.
+
 	* posix/getopt.c (_getopt_internal_r): Remove old POSIX-demanded
 	error message.  POSIX today does not require the messages to be in
 	a specific form.  Suggested by Jim Meyering <jim@meyering.net>.
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
index eab658da31..be979d8c8a 100644
--- a/sysdeps/posix/tempname.c
+++ b/sysdeps/posix/tempname.c
@@ -297,7 +297,7 @@ __gen_tempname (char *tmpl, int flags, int kind)
 	{
 	case __GT_FILE:
 	  fd = __open (tmpl,
-		       (flags & ~ACCESSPERMS)
+		       (flags & ~O_ACCMODE)
 		       | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 	  break;