Index: share/man/man4/rights.4
===================================================================
--- share/man/man4/rights.4
+++ share/man/man4/rights.4
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 30, 2018
+.Dd January 24, 2019
 .Dt RIGHTS 4
 .Os
 .Sh NAME
@@ -467,9 +467,6 @@
 .It Dv CAP_PDKILL
 Permit
 .Xr pdkill 2 .
-.It Dv CAP_PDWAIT
-Permit
-.Xr pdwait4 2 .
 .It Dv CAP_PEELOFF
 Permit
 .Xr sctp_peeloff 2 .
Index: sys/sys/capsicum.h
===================================================================
--- sys/sys/capsicum.h
+++ sys/sys/capsicum.h
@@ -246,8 +246,6 @@
 /* Process management via process descriptors. */
 /* Allows for pdgetpid(2). */
 #define	CAP_PDGETPID		CAPRIGHT(1, 0x0000000000000200ULL)
-/* Allows for pdwait4(2). */
-#define	CAP_PDWAIT		CAPRIGHT(1, 0x0000000000000400ULL)
 /* Allows for pdkill(2). */
 #define	CAP_PDKILL		CAPRIGHT(1, 0x0000000000000800ULL)
 
@@ -277,10 +275,10 @@
 #define	CAP_KQUEUE		(CAP_KQUEUE_EVENT | CAP_KQUEUE_CHANGE)
 
 /* All used bits for index 1. */
-#define	CAP_ALL1		CAPRIGHT(1, 0x00000000001FFFFFULL)
+#define	CAP_ALL1		CAPRIGHT(1, 0x00000000001FFBFFULL)
 
 /* Available bits for index 1. */
-#define	CAP_UNUSED1_22		CAPRIGHT(1, 0x0000000000200000ULL)
+#define	CAP_UNUSED1_22		CAPRIGHT(1, 0x0000000000200400ULL)
 /* ... */
 #define	CAP_UNUSED1_57		CAPRIGHT(1, 0x0100000000000000ULL)
 
Index: tools/regression/security/cap_test/cap_test_capabilities.c
===================================================================
--- tools/regression/security/cap_test/cap_test_capabilities.c
+++ tools/regression/security/cap_test/cap_test_capabilities.c
@@ -550,7 +550,6 @@
 	TRY(CAP_IOCTL);
 	TRY(CAP_TTYHOOK);
 	TRY(CAP_PDGETPID);
-	TRY(CAP_PDWAIT);
 	TRY(CAP_PDKILL);
 #endif
 
Index: usr.bin/procstat/procstat_files.c
===================================================================
--- usr.bin/procstat/procstat_files.c
+++ usr.bin/procstat/procstat_files.c
@@ -209,7 +209,6 @@
 
 	/* Process management via process descriptors. */
 	{ CAP_PDGETPID,		"pg" },
-	{ CAP_PDWAIT,		"pw" },
 	{ CAP_PDKILL,		"pk" },
 
 	/*