diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile
--- a/lib/libpkgconf/Makefile
+++ b/lib/libpkgconf/Makefile
@@ -7,9 +7,10 @@
 MANNODEV=	pc.5
 MANNODEV+=	pkgconf-personality.5
 
-SRCS=		audit.c buffer.c cache.c client.c pkg.c bsdstubs.c fragment.c
-SRCS+=		argvsplit.c fileio.c tuple.c dependency.c queue.c
-SRCS+=		path.c personality.c parser.c
+SRCS=		argvsplit.c audit.c bsdstubs.c buffer.c bufferset.c bytecode.c
+SRCS+=		cache.c client.c dependency.c fileio.c fragment.c license.c
+SRCS+=		output.c parser.c path.c personality.c pkg.c queue.c tuple.c
+SRCS+=		variable.c version.c
 INCS=		bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h
 
 WARNS?=		3
diff --git a/packages/pkgconf/pkgconf.ucl b/packages/pkgconf/pkgconf.ucl
--- a/packages/pkgconf/pkgconf.ucl
+++ b/packages/pkgconf/pkgconf.ucl
@@ -25,8 +25,8 @@
 pkg-config from freedesktop.org, but does not provide bug-compatibility with
 the original pkg-config.
 
-Also provided is bomtool(1), a program which generates a textual SPDX 2.0
-software bill of materials (SBOM) for a given set of pkg-config modules.  The
-output of this tool can then be translated into other SBOM formats as
-necessary.
+Also provided are bomtool(1) and spdxtool(1), programs generating software bill
+of materials (SBOM) for a given set of pkg-config modules, in the SPDX version
+2.2 and 3.0.1 file formats, respectively.  The output of these tools can then be
+translated into other SBOM formats as necessary.
 EOD
diff --git a/usr.bin/pkgconf/Makefile b/usr.bin/pkgconf/Makefile
--- a/usr.bin/pkgconf/Makefile
+++ b/usr.bin/pkgconf/Makefile
@@ -2,6 +2,7 @@
 
 PROG=		pkgconf
 SRCS=		main.c
+SRCS+=		core.c
 SRCS+=		getopt_long.c
 SRCS+=		renderer-msvc.c