diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c
index c5cb97dd2241..52f89e97f38b 100644
--- a/sys/compat/hpux/hpux_file.c
+++ b/sys/compat/hpux/hpux_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_file.c,v 1.29 2005/12/11 12:20:02 christos Exp $	*/
+/*	$NetBSD: hpux_file.c,v 1.30 2006/09/25 16:16:18 pavel Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.29 2005/12/11 12:20:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.30 2006/09/25 16:16:18 pavel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -771,7 +771,7 @@ hpux_sys_mknod(l, v, retval)
 	/*
 	 * BSD handles FIFOs separately.
 	 */
-	if (SCARG(uap, mode) & S_IFIFO) {
+	if (S_ISFIFO(SCARG(uap, mode))) {
 		SCARG(&bma, path) = SCARG(uap, path);
 		SCARG(&bma, mode) = SCARG(uap, mode);
 		return (sys_mkfifo(l, uap, retval));
diff --git a/sys/compat/linux/common/linux_file.c b/sys/compat/linux/common/linux_file.c
index 76cf197a5404..32e3bfe77c79 100644
--- a/sys/compat/linux/common/linux_file.c
+++ b/sys/compat/linux/common/linux_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_file.c,v 1.73 2006/07/23 22:06:09 ad Exp $	*/
+/*	$NetBSD: linux_file.c,v 1.74 2006/09/25 16:16:18 pavel Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.73 2006/07/23 22:06:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.74 2006/09/25 16:16:18 pavel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -737,7 +737,7 @@ linux_sys_mknod(l, v, retval)
 	/*
 	 * BSD handles FIFOs separately
 	 */
-	if (SCARG(uap, mode) & S_IFIFO) {
+	if (S_ISFIFO(SCARG(uap, mode))) {
 		struct sys_mkfifo_args bma;
 
 		SCARG(&bma, path) = SCARG(uap, path);