diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc
index 64629f6911ee..7e05ea88cb93 100644
--- a/lib/libc/aarch64/sys/Makefile.inc
+++ b/lib/libc/aarch64/sys/Makefile.inc
@@ -15,7 +15,6 @@ MDASM=	cerror.S \
 NOASM=	break.o \
 	exit.o \
 	getlogin.o \
-	openbsd_poll.o \
 	sbrk.o \
 	sstk.o \
 	vfork.o \
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index d7bfa8ea02bf..7f84c4b01935 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -8,6 +8,6 @@ MDASM=	vfork.S brk.S cerror.S exect.S getcontext.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc
index 37549bfc1bda..794454deddaa 100644
--- a/lib/libc/arm/sys/Makefile.inc
+++ b/lib/libc/arm/sys/Makefile.inc
@@ -5,6 +5,6 @@ SRCS+=	__vdso_gettc.c
 MDASM= Ovfork.S brk.S cerror.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index 3573623bce81..ca0a0676f1ff 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -11,7 +11,7 @@ MDASM=	Ovfork.S brk.S cerror.S exect.S getcontext.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
 
diff --git a/lib/libc/mips/sys/Makefile.inc b/lib/libc/mips/sys/Makefile.inc
index fb6bdf60e115..4a6491b2e10b 100644
--- a/lib/libc/mips/sys/Makefile.inc
+++ b/lib/libc/mips/sys/Makefile.inc
@@ -6,6 +6,6 @@ MDASM=  Ovfork.S brk.S cerror.S exect.S \
 	ptrace.S sbrk.S syscall.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o vfork.o yield.o
 
 PSEUDO= _exit.o _getlogin.o
diff --git a/lib/libc/powerpc/sys/Makefile.inc b/lib/libc/powerpc/sys/Makefile.inc
index 4948f6754c9f..061abd4ebccc 100644
--- a/lib/libc/powerpc/sys/Makefile.inc
+++ b/lib/libc/powerpc/sys/Makefile.inc
@@ -3,6 +3,6 @@
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/powerpc64/sys/Makefile.inc b/lib/libc/powerpc64/sys/Makefile.inc
index 4948f6754c9f..061abd4ebccc 100644
--- a/lib/libc/powerpc64/sys/Makefile.inc
+++ b/lib/libc/powerpc64/sys/Makefile.inc
@@ -3,6 +3,6 @@
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libc/riscv/sys/Makefile.inc
index cde78d5dd706..1e1abc744096 100644
--- a/lib/libc/riscv/sys/Makefile.inc
+++ b/lib/libc/riscv/sys/Makefile.inc
@@ -13,7 +13,6 @@ MDASM=	cerror.S \
 NOASM=	break.o \
 	exit.o \
 	getlogin.o \
-	openbsd_poll.o \
 	sbrk.o \
 	sstk.o \
 	vfork.o \
diff --git a/lib/libc/sparc64/sys/Makefile.inc b/lib/libc/sparc64/sys/Makefile.inc
index 3edc72958d24..a45b15e1556d 100644
--- a/lib/libc/sparc64/sys/Makefile.inc
+++ b/lib/libc/sparc64/sys/Makefile.inc
@@ -15,6 +15,6 @@ CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu
 MDASM+=	brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S sigaction1.S
 
 # Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM=	break.o exit.o getlogin.o sstk.o yield.o
 
 PSEUDO=	_getlogin.o _exit.o
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index 3172db49d93d..db3adfd60235 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -474,8 +474,7 @@
 250	AUE_MINHERIT	NOPROTO	{ int minherit(void *addr, size_t len, \
 				    int inherit); }
 251	AUE_RFORK	NOPROTO	{ int rfork(int flags); }
-252	AUE_POLL	NOPROTO	{ int openbsd_poll(struct pollfd *fds, \
-				    u_int nfds, int timeout); }
+252	AUE_NULL	OBSOL	openbsd_poll
 253	AUE_ISSETUGID	NOPROTO	{ int issetugid(void); }
 254	AUE_LCHOWN	NOPROTO	{ int lchown(char *path, int uid, int gid); }
 255	AUE_NULL	STD	{ int freebsd32_aio_read( \
diff --git a/sys/kern/capabilities.conf b/sys/kern/capabilities.conf
index 24bac6b92b08..51cdafdd2cc1 100644
--- a/sys/kern/capabilities.conf
+++ b/sys/kern/capabilities.conf
@@ -462,14 +462,6 @@ utimensat
 ##
 open
 
-##
-## Allow poll(2), which will be scoped by capability rights.
-##
-## XXXRW: Perhaps we don't need the OpenBSD version?
-## XXXRW: We don't yet do that scoping.
-##
-openbsd_poll
-
 ##
 ## Process descriptor-related system calls are allowed.
 ##
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 8a77e17d035e..04dd82d38ad6 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1607,26 +1607,6 @@ pollscan(td, fds, nfd)
 	return (0);
 }
 
-/*
- * OpenBSD poll system call.
- *
- * XXX this isn't quite a true representation..  OpenBSD uses select ops.
- */
-#ifndef _SYS_SYSPROTO_H_
-struct openbsd_poll_args {
-	struct pollfd *fds;
-	u_int	nfds;
-	int	timeout;
-};
-#endif
-int
-sys_openbsd_poll(td, uap)
-	register struct thread *td;
-	register struct openbsd_poll_args *uap;
-{
-	return (sys_poll(td, (struct poll_args *)uap));
-}
-
 /*
  * XXX This was created specifically to support netncp and netsmb.  This
  * allows the caller to specify a socket to wait for events on.  It returns
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 2c5840639077..b3d27dc2d5a5 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -472,8 +472,7 @@
 250	AUE_MINHERIT	STD	{ int minherit(void *addr, size_t len, \
 				    int inherit); }
 251	AUE_RFORK	STD	{ int rfork(int flags); }
-252	AUE_POLL	STD	{ int openbsd_poll(struct pollfd *fds, \
-				    u_int nfds, int timeout); }
+252	AUE_NULL	OBSOL	openbsd_poll
 253	AUE_ISSETUGID	STD	{ int issetugid(void); }
 254	AUE_LCHOWN	STD	{ int lchown(char *path, int uid, int gid); }
 255	AUE_NULL	STD	{ int aio_read(struct aiocb *aiocbp); }
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 83b6261b8490..4f5c689b3424 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200001	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200002	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,