diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f974f7959..8a4df21ff 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler.cc (fhandler_base::fstat): Set pipe permission bits more
+	correctly.
+
 2007-06-11  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din (confstr): Export.
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 5490d3ab0..4348b8792 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1127,13 +1127,13 @@ fhandler_base::fstat (struct __stat64 *buf)
   switch (get_device ())
     {
     case FH_PIPE:
-      buf->st_mode = S_IFIFO | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
+      buf->st_mode = S_IFIFO | S_IRUSR | S_IWUSR;
       break;
     case FH_PIPEW:
-      buf->st_mode = S_IFIFO | STD_WBITS | S_IWGRP | S_IWOTH;
+      buf->st_mode = S_IFIFO | S_IWUSR;
       break;
     case FH_PIPER:
-      buf->st_mode = S_IFIFO | STD_RBITS;
+      buf->st_mode = S_IFIFO | S_IRUSR;
       break;
     case FH_FULL:
       buf->st_mode = S_IFCHR | S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;