diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 43d81c10f..c37b3c504 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -491,7 +491,7 @@ fhandler_base::fstat_helper (struct stat *buf)
       else
 	{
 	  buf->st_dev = buf->st_rdev = dev ();
-	  buf->st_mode |= dev ().mode () & S_IFMT;
+	  buf->st_mode = dev ().mode ();
 	  buf->st_size = 0;
 	}
     }
diff --git a/winsup/cygwin/release/3.1.5 b/winsup/cygwin/release/3.1.5
index 1e3763f6c..0a78f5ff0 100644
--- a/winsup/cygwin/release/3.1.5
+++ b/winsup/cygwin/release/3.1.5
@@ -32,3 +32,6 @@ Bug Fixes:
 - Make sure pseudo tty doesn't hang if cygwin-console-helper.exe is
   non-functional.
   Addresses: https://cygwin.com/pipermail/cygwin-patches/2020q2/010191.html
+
+- Fix a bug causing FIFOs to have incorrect permissions.
+  Addresses: https://sourceware.org/pipermail/cygwin/2020-May/245031.html