diff --git a/release/packages/ucl/bsdconfig-all.ucl b/release/packages/ucl/bsdconfig-all.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/ucl/bsdconfig-all.ucl
@@ -0,0 +1,5 @@
+comment = "System configuration utility"
+desc = <<EOD
+bsdconfig(8) and bsdinstall(8) provide graphical interfaces to configure the
+system and to install new instances of the system, e.g. to create jails.
+EOD
diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile
--- a/usr.sbin/bsdconfig/Makefile
+++ b/usr.sbin/bsdconfig/Makefile
@@ -1,5 +1,7 @@
 .include <src.opts.mk>
 
+PACKAGE=	bsdconfig
+
 SUBDIR=	console \
 	diskmgmt \
 	docsinstall \
diff --git a/usr.sbin/bsdconfig/Makefile.inc b/usr.sbin/bsdconfig/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/Makefile.inc
@@ -0,0 +1 @@
+PACKAGE=	bsdconfig
diff --git a/usr.sbin/bsdconfig/networking/Makefile.inc b/usr.sbin/bsdconfig/networking/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/networking/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/packages/Makefile.inc b/usr.sbin/bsdconfig/packages/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/packages/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/password/Makefile.inc b/usr.sbin/bsdconfig/password/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/password/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/share/Makefile.inc b/usr.sbin/bsdconfig/share/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/share/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/startup/Makefile.inc b/usr.sbin/bsdconfig/startup/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/startup/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/timezone/Makefile.inc b/usr.sbin/bsdconfig/timezone/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/timezone/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile.inc b/usr.sbin/bsdconfig/usermgmt/Makefile.inc
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bsdconfig/usermgmt/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/usr.sbin/sysrc/Makefile b/usr.sbin/sysrc/Makefile
--- a/usr.sbin/sysrc/Makefile
+++ b/usr.sbin/sysrc/Makefile
@@ -1,5 +1,6 @@
 .include <src.opts.mk>
 
+PACKAGE= bsdconfig
 SCRIPTS= sysrc
 
 MAN= sysrc.8