Index: sys/amd64/conf/CAPSICUM
===================================================================
--- sys/amd64/conf/CAPSICUM	(revision 0)
+++ sys/amd64/conf/CAPSICUM	(working copy)
@@ -0,0 +1,16 @@
+#
+# CAPSICUM - Capsicum kernel configuration file for FreeBSD/amd64
+#
+# $FreeBSD$
+#
+include		GENERIC
+ident		CAPSICUM
+
+#
+# Options specified in capsicum(4)
+#
+options CAPABILITY_MODE
+options CAPABILITIES
+
+# process descriptor facility support
+options PROCDESC
Index: Makefile
===================================================================
--- Makefile	(revision 240694)
+++ Makefile	(working copy)
@@ -87,7 +87,7 @@
 # For more information, see the build(7) manual page.
 #
 TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
-	check-old check-old-dirs check-old-files check-old-libs \
+	capsicum check-old check-old-dirs check-old-files check-old-libs \
 	checkdpadd clean cleandepend cleandir \
 	delete-old delete-old-dirs delete-old-files delete-old-libs \
 	depend distribute distributekernel distributekernel.debug \
@@ -276,6 +276,14 @@
 kernel: buildkernel installkernel
 
 #
+# capsicum
+#
+# Short hand for building capsicum(4) aware kernels
+#
+capsicum:
+	${MAKE} kernel KERNCONF=${.TARGET:U}
+
+#
 # Perform a few tests to determine if the installed tools are adequate
 # for building the world.
 #