Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -218,7 +218,6 @@
     ZONEINFO_LEAPSECONDS_SUPPORT \
 
 __REQUIRED_OPTIONS = \
-    CAPSICUM \
     CASPER
 
 # LEFT/RIGHT. Left options which default to "yes" unless their corresponding
@@ -383,10 +382,6 @@
 # Force some options off if their dependencies are off.
 # Order is somewhat important.
 #
-.if ${MK_CAPSICUM} == "no"
-MK_CASPER:=	no
-.endif
-
 .if ${MK_SOURCELESS} == "no"
 MK_SOURCELESS_HOST:=	no
 MK_SOURCELESS_UCODE:= no
Index: tools/build/options/WITHOUT_CAPSICUM
===================================================================
--- tools/build/options/WITHOUT_CAPSICUM
+++ /dev/null
@@ -1 +0,0 @@
-This option has no effect.
Index: usr.bin/xz/Makefile
===================================================================
--- usr.bin/xz/Makefile
+++ usr.bin/xz/Makefile
@@ -43,10 +43,6 @@
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-.if ${MK_CAPSICUM} == "no"
-CFLAGS+=	-DWITHOUT_CAPSICUM
-.endif
-
 LIBADD=	lzma
 
 .include <bsd.prog.mk>