diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index 82ff597733cc..d886328f5d6f 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -1,83 +1,84 @@
     COMMENT = Ports for managing, installing, and developing FreeBSD ports and packages
 
     SUBDIR += bsdadminscripts2
     SUBDIR += caronade
     SUBDIR += create-rb-port
     SUBDIR += dialog4ports
     SUBDIR += dialog4ports-static
     SUBDIR += distilator
     SUBDIR += fallout
     SUBDIR += fastest_pkg
     SUBDIR += freebsd-bugzilla-cli
     SUBDIR += genpatch
     SUBDIR += genplist
     SUBDIR += hs-cabal2tuple
     SUBDIR += hs-panopticum
     SUBDIR += jailaudit
     SUBDIR += lsknobs
     SUBDIR += mkreadmes
     SUBDIR += modules2tuple
     SUBDIR += octopkg
     SUBDIR += p5-FreeBSD-Ports
     SUBDIR += p5-FreeBSD-Ports-INDEXhash
     SUBDIR += packagekit
     SUBDIR += packagekit-qt
     SUBDIR += parfetch-overlay
     SUBDIR += pchecker
     SUBDIR += pkg
+    SUBDIR += pkg-appstream
     SUBDIR += pkg-devel
     SUBDIR += pkg-graph
     SUBDIR += pkg-provides
     SUBDIR += pkg-rmleaf
     SUBDIR += pkg_cleanup
     SUBDIR += pkg_cutleaves
     SUBDIR += pkg_jail
     SUBDIR += pkg_replace
     SUBDIR += pkg_rmleaves
     SUBDIR += pkg_search
     SUBDIR += pkg_tree
     SUBDIR += pkgcompare
     SUBDIR += pkgs_which
     SUBDIR += port-authoring-tools
     SUBDIR += port-index-uniquifier
     SUBDIR += port-maintenance-tools
     SUBDIR += portal
     SUBDIR += portconf
     SUBDIR += portconfig
     SUBDIR += portdowngrade
     SUBDIR += portest
     SUBDIR += portfind
     SUBDIR += portfmt
     SUBDIR += portgraph
     SUBDIR += portgrep
     SUBDIR += portless
     SUBDIR += portlint
     SUBDIR += portmaster
     SUBDIR += portrac
     SUBDIR += ports-tools
     SUBDIR += portscout
     SUBDIR += portsdb
     SUBDIR += portsearch
     SUBDIR += portshaker
     SUBDIR += portshaker-config
     SUBDIR += portsnap
     SUBDIR += portsreinstall
     SUBDIR += porttools
     SUBDIR += porttree
     SUBDIR += portupdate-scan
     SUBDIR += portupgrade
     SUBDIR += portupgrade-devel
     SUBDIR += poudriere
     SUBDIR += poudriere-devel
     SUBDIR += psearch
     SUBDIR += py-FreeBSD-ports
     SUBDIR += py-pytoport
     SUBDIR += py-skog
     SUBDIR += rc-subr-jail
     SUBDIR += reprise
     SUBDIR += sccache-overlay
     SUBDIR += submodules2tuple
     SUBDIR += synth
     SUBDIR += wanted-ports
 
 .include <bsd.port.subdir.mk>
diff --git a/ports-mgmt/pkg-appstream/Makefile b/ports-mgmt/pkg-appstream/Makefile
new file mode 100644
index 000000000000..b7acf9e470b2
--- /dev/null
+++ b/ports-mgmt/pkg-appstream/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	pkg-appstream
+DISTVERSIONPREFIX=	v
+PORTVERSION=	1.0.0
+CATEGORIES=	ports-mgmt
+
+MAINTAINER=	arrowd@FreeBSD.org
+COMMENT=	Pkg plugin for downloading AppStream metadata
+WWW=		https://github.com/freebsd/pkg-appstream
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/include/pkg.h:ports-mgmt/pkg
+
+USES=		localbase
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+
+MAKE_ENV=	LIBOWN=nobody LIBGRP=nobody
+
+PLIST_FILES=	lib/pkg/appstream.so
+
+pre-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/pkg
+
+.include <bsd.port.mk>
diff --git a/ports-mgmt/pkg-appstream/distinfo b/ports-mgmt/pkg-appstream/distinfo
new file mode 100644
index 000000000000..7fc351647ff6
--- /dev/null
+++ b/ports-mgmt/pkg-appstream/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1691477749
+SHA256 (freebsd-pkg-appstream-v1.0.0_GH0.tar.gz) = b3e8b0dd9d8fd4deefa6a91d6e76d81c5483292ee05fabb4311eaca6a068e09e
+SIZE (freebsd-pkg-appstream-v1.0.0_GH0.tar.gz) = 2404
diff --git a/ports-mgmt/pkg-appstream/pkg-descr b/ports-mgmt/pkg-appstream/pkg-descr
new file mode 100644
index 000000000000..3896d18e481a
--- /dev/null
+++ b/ports-mgmt/pkg-appstream/pkg-descr
@@ -0,0 +1,2 @@
+This libpkg plugin is supposed to fill /var/lib/swcatalog/xml/ directory with
+up-to-date AppStream metadata from pkg repositories that support that.