diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 4d6afe84ec23..ab1de54ac96c 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	pkg
-DISTVERSION=	1.17.99.3
+DISTVERSION=	1.17.99.4
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	014693e3
+GH_TAGNAME=	9de47aa4
 
 CFLAGS+=	-O0 -g -Wno-error
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 HAS_CONFIGURE=	yes
 PORTDOCS=	NEWS
 PORTSCOUT=	ignore:1
 CONFIGURE_ARGS=	--mandir=${PREFIX}/man --prefix="${PREFIX}"
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	DOCS SAN
 SAN_DESC=	Enable sanitizers (ASAN and UBSAN)
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSAN}
 CONFIGURE_ARGS+=	--with-asan --with-ubsan
 .endif
 
 # TODO: activate in april 2021
 #.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000
 #CONFIGURE_ARGS+=	--default-format=tzst
 #.endif
 
 .if !exists(/usr/libdata/pkgconfig/liblzma.pc)
 LIBLZMA_LIBS=	-llzma
 .else
 LIBLZMA_PC!=	${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc
 LIBLZMA_LIBS=	${LIBLZMA_PC:M-l*}
 .endif
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} != devel
 .	if !defined(PACKAGE_BUILDING)
 IGNORE=	WITH_PKG is not defined to 'devel', this version is the devel one
 .	endif
 .else
 PKGNAMESUFFIX=
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .endif
 .endif
 
 .undef INSTALLS_DEPENDS
 .if !exists(${LOCALBASE}/sbin/pkg) && !defined(CROSS_TOOLCHAIN)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \
 		${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup
 
 .if ${PORT_OPTIONS:MSAN}
 post-build:
 	@(cd ${WRKSRC}/src && \
 		${LN} -fs pkg pkg-static)
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 .if ${PORT_OPTIONS:MSAN}
 	@${CP} ${STAGEDIR}${PREFIX}/sbin/pkg ${STAGEDIR}${PREFIX}/sbin/pkg-static
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index 9971066b2835..581fa136ca44 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629729720
-SHA256 (freebsd-pkg-1.17.99.3-014693e3_GH0.tar.gz) = e5c50638b53339148d517bc6e051eddb89a79058140353792ddae6a9eb7fb3a0
-SIZE (freebsd-pkg-1.17.99.3-014693e3_GH0.tar.gz) = 3889805
+TIMESTAMP = 1631625378
+SHA256 (freebsd-pkg-1.17.99.4-9de47aa4_GH0.tar.gz) = d1eee13802c889ab18d3a8d21070529e332be093b22eff137c7bbe15650c23e7
+SIZE (freebsd-pkg-1.17.99.4-9de47aa4_GH0.tar.gz) = 3892112
diff --git a/ports-mgmt/pkg-devel/pkg-plist b/ports-mgmt/pkg-devel/pkg-plist
index 13ab1be3d794..017496f122f2 100644
--- a/ports-mgmt/pkg-devel/pkg-plist
+++ b/ports-mgmt/pkg-devel/pkg-plist
@@ -1,59 +1,60 @@
 etc/bash_completion.d/_pkg.bash
 etc/periodic/daily/411.pkg-backup
 etc/periodic/daily/490.status-pkg-changes
+etc/periodic/security/405.pkg-base-audit
 etc/periodic/security/410.pkg-audit
 etc/periodic/security/460.pkg-checksum
 etc/periodic/weekly/400.status-pkg
 @sample etc/pkg.conf.sample
 include/pkg.h
 include/pkg/audit.h
 lib/libpkg.a
 lib/libpkg.so
 lib/libpkg.so.4
 libdata/pkgconfig/pkg.pc
 man/man3/pkg_create.3.gz
 man/man3/pkg_printf.3.gz
 man/man3/pkg_repos.3.gz
 man/man5/pkg-repository.5.gz
 man/man5/pkg-keywords.5.gz
 man/man5/pkg-lua-script.5.gz
 man/man5/pkg-script.5.gz
 man/man5/pkg.conf.5.gz
 man/man8/pkg-add.8.gz
 man/man8/pkg-alias.8.gz
 man/man8/pkg-annotate.8.gz
 man/man8/pkg-audit.8.gz
 man/man8/pkg-autoremove.8.gz
 man/man8/pkg-backup.8.gz
 man/man8/pkg-check.8.gz
 man/man8/pkg-clean.8.gz
 man/man8/pkg-config.8.gz
 man/man8/pkg-create.8.gz
 man/man8/pkg-delete.8.gz
 man/man8/pkg-fetch.8.gz
 man/man8/pkg-info.8.gz
 man/man8/pkg-install.8.gz
 man/man8/pkg-lock.8.gz
 man/man8/pkg-query.8.gz
 man/man8/pkg-register.8.gz
 man/man8/pkg-remove.8.gz
 man/man8/pkg-repo.8.gz
 man/man8/pkg-rquery.8.gz
 man/man8/pkg-search.8.gz
 man/man8/pkg-set.8.gz
 man/man8/pkg-shell.8.gz
 man/man8/pkg-shlib.8.gz
 man/man8/pkg-ssh.8.gz
 man/man8/pkg-static.8.gz
 man/man8/pkg-stats.8.gz
 man/man8/pkg-unlock.8.gz
 man/man8/pkg-update.8.gz
 man/man8/pkg-updating.8.gz
 man/man8/pkg-upgrade.8.gz
 man/man8/pkg-version.8.gz
 man/man8/pkg-which.8.gz
 man/man8/pkg.8.gz
 sbin/pkg
 sbin/pkg-static
 share/zsh/site-functions/_pkg
 @dir lib/compat/pkg