Index: sys/amd64/linux/syscalls.master
===================================================================
--- sys/amd64/linux/syscalls.master
+++ sys/amd64/linux/syscalls.master
@@ -2094,7 +2094,12 @@
 		int linux_pidfd_getfd(void);
 	}
 439    AUE_NULL		STD {
-		int linux_faccessat2(void);
+		int linux_faccessat2(
+		    l_int dfd,
+		    const char *filename,
+		    l_int amode,
+		    l_int flags
+		);
 	}
 440    AUE_NULL		STD {
 		int linux_process_madvise(void);
Index: sys/amd64/linux32/syscalls.master
===================================================================
--- sys/amd64/linux32/syscalls.master
+++ sys/amd64/linux32/syscalls.master
@@ -2496,7 +2496,12 @@
 		int linux_pidfd_getfd(void);
 	}
 439    AUE_NULL		STD {
-		int linux_faccessat2(void);
+		int linux_faccessat2(
+		    l_int dfd,
+		    const char *filename,
+		    l_int amode,
+		    l_int flags
+		);
 	}
 440    AUE_NULL		STD {
 		int linux_process_madvise(void);
Index: sys/arm64/linux/syscalls.master
===================================================================
--- sys/arm64/linux/syscalls.master
+++ sys/arm64/linux/syscalls.master
@@ -1743,7 +1743,12 @@
 		int linux_pidfd_getfd(void);
 	}
 439    AUE_NULL		STD {
-		int linux_faccessat2(void);
+		int linux_faccessat2(
+		    l_int dfd,
+		    const char *filename,
+		    l_int amode,
+		    l_int flags
+		);
 	}
 440    AUE_NULL		STD {
 		int linux_process_madvise(void);
Index: sys/compat/linux/linux_file.c
===================================================================
--- sys/compat/linux/linux_file.c
+++ sys/compat/linux/linux_file.c
@@ -70,6 +70,7 @@
 
 static int	linux_common_open(struct thread *, int, const char *, int, int,
 		    enum uio_seg);
+static int	linux_do_accessat(struct thread *t, int, const char *, int, int);
 static int	linux_getdents_error(struct thread *, int, int);
 
 static struct bsd_to_linux_bitmap seal_bitmap[] = {
@@ -675,28 +676,58 @@
 }
 #endif
 
-int
-linux_faccessat(struct thread *td, struct linux_faccessat_args *args)
+static int
+linux_do_accessat(struct thread *td, int ldfd, const char *filename,
+    int amode, int flags)
 {
 	char *path;
 	int error, dfd;
 
 	/* Linux convention. */
-	if (args->amode & ~(F_OK | X_OK | W_OK | R_OK))
+	if (amode & ~(F_OK | X_OK | W_OK | R_OK))
 		return (EINVAL);
 
-	dfd = (args->dfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->dfd;
+	dfd = (ldfd == LINUX_AT_FDCWD) ? AT_FDCWD : ldfd;
 	if (!LUSECONVPATH(td)) {
-		error = kern_accessat(td, dfd, args->filename, UIO_USERSPACE, 0, args->amode);
+		error = kern_accessat(td, dfd, filename, UIO_USERSPACE, flags, amode);
 	} else {
-		LCONVPATHEXIST_AT(td, args->filename, &path, dfd);
-		error = kern_accessat(td, dfd, path, UIO_SYSSPACE, 0, args->amode);
+		LCONVPATHEXIST_AT(td, filename, &path, dfd);
+		error = kern_accessat(td, dfd, path, UIO_SYSSPACE, flags, amode);
 		LFREEPATH(path);
 	}
 
 	return (error);
 }
 
+int
+linux_faccessat(struct thread *td, struct linux_faccessat_args *args)
+{
+
+	return (linux_do_accessat(td, args->dfd, args->filename, args->amode,
+	    0));
+}
+
+int
+linux_faccessat2(struct thread *td, struct linux_faccessat2_args *args)
+{
+	int flags, unsupported;
+
+	/* XXX. AT_SYMLINK_NOFOLLOW is not supported by kern_accessat */
+	unsupported = args->flags & ~(LINUX_AT_EACCESS | LINUX_AT_EMPTY_PATH);
+	if (unsupported != 0) {
+		linux_msg(td, "faccessat2 unsupported flag 0x%x", unsupported);
+		return (EINVAL);
+	}
+
+	flags = (args->flags & LINUX_AT_EACCESS) == 0 ? 0 :
+	    AT_EACCESS;
+	flags |= (args->flags & LINUX_AT_EMPTY_PATH) == 0 ? 0 :
+	    AT_EMPTY_PATH;
+	return (linux_do_accessat(td, args->dfd, args->filename, args->amode,
+	    flags));
+}
+
+
 #ifdef LINUX_LEGACY_SYSCALLS
 int
 linux_unlink(struct thread *td, struct linux_unlink_args *args)
Index: sys/i386/linux/syscalls.master
===================================================================
--- sys/i386/linux/syscalls.master
+++ sys/i386/linux/syscalls.master
@@ -2514,7 +2514,12 @@
 		int linux_pidfd_getfd(void);
 	}
 439    AUE_NULL		STD {
-		int linux_faccessat2(void);
+		int linux_faccessat2(
+		    l_int dfd,
+		    const char *filename,
+		    l_int amode,
+		    l_int flags
+		);
 	}
 440    AUE_NULL		STD {
 		int linux_process_madvise(void);