diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -83,7 +83,6 @@
 	.vop_create =		VOP_PANIC,
 	.vop_getattr =		VOP_EBADF,
 	.vop_ioctl =		VOP_PANIC,
-	.vop_kqfilter =		VOP_PANIC,
 	.vop_link =		VOP_PANIC,
 	.vop_mkdir =		VOP_PANIC,
 	.vop_mknod =		VOP_PANIC,
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1751,6 +1751,10 @@
 		cpipe = PIPE_PEER(cpipe);
 		break;
 	default:
+		if ((cpipe->pipe_type & PIPE_TYPE_NAMED) != 0) {
+			PIPE_UNLOCK(cpipe);
+			return (vnops.fo_kqfilter(fp, kn));
+		}
 		PIPE_UNLOCK(cpipe);
 		return (EINVAL);
 	}
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -6172,6 +6172,9 @@
 	struct knote *kn = ap->a_kn;
 	struct knlist *knl;
 
+	KASSERT(vp->v_type != VFIFO || (kn->kn_filter != EVFILT_READ &&
+	    kn->kn_filter != EVFILT_WRITE),
+	    ("READ/WRITE filter on a FIFO leaked through"));
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		kn->kn_fop = &vfsread_filtops;
diff --git a/tests/sys/kqueue/libkqueue/common.h b/tests/sys/kqueue/libkqueue/common.h
--- a/tests/sys/kqueue/libkqueue/common.h
+++ b/tests/sys/kqueue/libkqueue/common.h
@@ -36,6 +36,8 @@
 #include <stdint.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include <sys/event.h>
diff --git a/tests/sys/kqueue/libkqueue/vnode.c b/tests/sys/kqueue/libkqueue/vnode.c
--- a/tests/sys/kqueue/libkqueue/vnode.c
+++ b/tests/sys/kqueue/libkqueue/vnode.c
@@ -64,6 +64,64 @@
     success();
 }
 
+static void
+test_kevent_vnode_note_delete_fifo(void)
+{
+    const char *test_id = "kevent(EVFILT_VNODE, NOTE_DELETE, FIFO)";
+    const char *fifo_path = "./kqueue-fifo.tmp";
+    struct kevent kev;
+    int fd;
+    pid_t pid;
+
+    test_begin(test_id);
+
+    if (mkfifo(fifo_path, 0600) != 0)
+        err(1, "mkfifo");
+
+    pid = fork();
+    if (pid == -1)
+        err(1, "fork");
+
+    if (pid == 0) {
+        char buf[4];
+
+        fd = open(fifo_path, O_RDONLY);
+        if (fd == -1)
+            _exit(1);
+
+        while (read(fd, buf, sizeof(buf)) != 0) {
+        }
+
+        _exit(0);
+    }
+
+    sleep(1);
+    if (waitpid(pid, NULL, WNOHANG) == pid) {
+        unlink(fifo_path);
+        err(1, "open");
+    }
+
+    fd = open(fifo_path, O_WRONLY);
+    if (fd < 0) {
+        unlink(fifo_path);
+        err(1, "open");
+    }
+
+    EV_SET(&kev, fd, EVFILT_VNODE, EV_ADD | EV_ONESHOT, NOTE_DELETE, 0, NULL);
+    if (kevent(kqfd, &kev, 1, NULL, 0, NULL) < 0) {
+        unlink(fifo_path);
+        err(1, "%s", test_id);
+    }
+
+    if (unlink(fifo_path) < 0)
+        err(1, "unlink");
+
+    kevent_cmp(&kev, kevent_get(kqfd));
+    close(fd);
+
+    success();
+}
+
 static void
 test_kevent_vnode_note_write(void)
 {
@@ -261,5 +319,6 @@
     test_kevent_vnode_note_attrib();
     test_kevent_vnode_note_rename();
     test_kevent_vnode_note_delete();
+    test_kevent_vnode_note_delete_fifo();
     close(kqfd);
 }