diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 1e2665f97d9b..aba3cc7fa5eb 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 WARNS?=	3
+PACKAGE=	binutils
 
 .include "../Makefile.inc"
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 67b61a875687..24bcd9868796 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -2,6 +2,7 @@
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
+PACKAGE=	groff
 
 # Define `page' to be letter if your PostScript printer uses 8.5x11
 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the
diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl
new file mode 100644
index 000000000000..677ac11b59b7
--- /dev/null
+++ b/release/packages/binutils.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-binutils"
+origin = "base"
+version = "%VERSION%"
+comment = "GNU binutils"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ GPLv2 ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/groff.ucl b/release/packages/groff.ucl
new file mode 100644
index 000000000000..757b2d82745f
--- /dev/null
+++ b/release/packages/groff.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-groff"
+origin = "base"
+version = "%VERSION%"
+comment = "GNU groff"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ GPLv2 ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/ssh-development.ucl b/release/packages/ssh-development.ucl
new file mode 100644
index 000000000000..cd40be5c79b1
--- /dev/null
+++ b/release/packages/ssh-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-ssh"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/ssh-lib32-development.ucl b/release/packages/ssh-lib32-development.ucl
new file mode 100644
index 000000000000..2c86746983d0
--- /dev/null
+++ b/release/packages/ssh-lib32-development.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-ssh-lib32"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell 32bits libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/ssh-lib32-profile.ucl b/release/packages/ssh-lib32-profile.ucl
new file mode 100644
index 000000000000..2c86746983d0
--- /dev/null
+++ b/release/packages/ssh-lib32-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-ssh-lib32"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell 32bits libraries"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/ssh-profile.ucl b/release/packages/ssh-profile.ucl
new file mode 100644
index 000000000000..cd40be5c79b1
--- /dev/null
+++ b/release/packages/ssh-profile.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-ssh"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/unbound-development.ucl b/release/packages/unbound-development.ucl
new file mode 100644
index 000000000000..071c858ce0b1
--- /dev/null
+++ b/release/packages/unbound-development.ucl
@@ -0,0 +1,14 @@
+name = "FreeBSD-unbound"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD
diff --git a/release/packages/unbound-lib32-development.ucl b/release/packages/unbound-lib32-development.ucl
new file mode 100644
index 000000000000..071c858ce0b1
--- /dev/null
+++ b/release/packages/unbound-lib32-development.ucl
@@ -0,0 +1,14 @@
+name = "FreeBSD-unbound"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD
diff --git a/release/packages/unbound-lib32-profile.ucl b/release/packages/unbound-lib32-profile.ucl
new file mode 100644
index 000000000000..071c858ce0b1
--- /dev/null
+++ b/release/packages/unbound-lib32-profile.ucl
@@ -0,0 +1,14 @@
+name = "FreeBSD-unbound"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD
diff --git a/release/packages/unbound-profile.ucl b/release/packages/unbound-profile.ucl
new file mode 100644
index 000000000000..071c858ce0b1
--- /dev/null
+++ b/release/packages/unbound-profile.ucl
@@ -0,0 +1,14 @@
+name = "FreeBSD-unbound"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD