diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -4,6 +4,10 @@
 MAN=	jail.8 jail.conf.5
 SRCS=	jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
 
+CONFGROUPS=	CONFS
+CONFS=		jail.conf
+CONFSDIR=	/etc
+
 LIBADD=	jail kvm util
 
 PACKAGE=jail
diff --git a/usr.sbin/jail/jail.conf b/usr.sbin/jail/jail.conf
new file mode 100644
--- /dev/null
+++ b/usr.sbin/jail/jail.conf
@@ -0,0 +1 @@
+.include "/etc/jail.conf.d/*.conf";