diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 1c0c294666c6..1cf1dc4656fc 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	pkg
-DISTVERSION=	1.17.99.1
+DISTVERSION=	1.17.99.2
 _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=	156c1c06
+GH_TAGNAME=	21cf05a9
 
 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
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 # 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
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index b28541cc5996..4d69387a0b38 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626940540
-SHA256 (freebsd-pkg-1.17.99.1-156c1c06_GH0.tar.gz) = ca7edf8c5ed57b81bfd2db7fe59648a8bc858b678d52913035c66ec13fc68294
-SIZE (freebsd-pkg-1.17.99.1-156c1c06_GH0.tar.gz) = 3894459
+TIMESTAMP = 1627375032
+SHA256 (freebsd-pkg-1.17.99.2-21cf05a9_GH0.tar.gz) = eea8257d5242e95c2b044044dd4fd0971b91d04ee1da566c1aadf681e269caa1
+SIZE (freebsd-pkg-1.17.99.2-21cf05a9_GH0.tar.gz) = 3894800