diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b031f2ebbe35..037e65f11806 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,91 +1,90 @@
 PORTNAME=	pkg
-DISTVERSION=	1.17.5
-PORTREVISION=	1
+DISTVERSION=	1.18.0
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 #MASTER_SITES=	\
 #		http://files.etoilebsd.net/${PORTNAME}/ \
 #		LOCAL/portmgr \
 #		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 
 MAINTAINER=	pkg@FreeBSD.org
 COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 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
 CFLAGS+=	-Wno-error
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
 .endif
 
 .if defined(WITH_PKG)
 .if ${WITH_PKG} == devel
 IGNORE=	WITH_PKG is defined to 'devel', this version is the stable one
 .endif
 .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
 NB_OLDPKGS!=	pkg_info 2>/dev/null | wc -l
 .if exists(${PKG_BIN})
 NB_NEWPKGS!=	${PKG_INFO} -aq | wc -l
 .else
 NB_NEWPKGS=	0
 .endif
 # Only show the pre-everything notice if they have not already
 # converted any packages
 .if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 && !defined(UPGRADEPKG)
 
 pre-everything::
 	@${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \
 	 ${ECHO_CMD} "installed with the old pkg_install tools."; \
 	 ${ECHO_CMD} ""; \
 	 ${ECHO_CMD} "To switch to pkg:"; \
 	 ${ECHO_CMD} "    1) Install ports-mgmt/pkg"; \
 	 ${ECHO_CMD} "       cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \
 	 ${ECHO_CMD} "    2) Convert your package database by running pkg2ng"; \
 	 ${ECHO_CMD} ""; \
 	exit 1
 
 .endif
 .endif
 .endif
 
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 PKG_DEPENDS=
 .undef INSTALLS_DEPENDS
 
 # Use the internal pkg instead, generally, unless this is a cross-build,
 # in which case that won't work. Hope for the best then.
 .if !defined(CROSS_TOOLCHAIN)
 PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 0e828a5b79a8..7e51f2e264df 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636711882
-SHA256 (freebsd-pkg-1.17.5_GH0.tar.gz) = 4ee22102c136898ec19e6359079a492dc898309bc284dd26e9ec9f5d8b5bae77
-SIZE (freebsd-pkg-1.17.5_GH0.tar.gz) = 3898974
+TIMESTAMP = 1655968889
+SHA256 (freebsd-pkg-1.18.0_GH0.tar.gz) = 69fa7e536b5f86878acc4521ab6560afaa919055c6f56809986abb5740833e09
+SIZE (freebsd-pkg-1.18.0_GH0.tar.gz) = 4019915
diff --git a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c b/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
deleted file mode 100644
index 7d54afff36e2..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpkg/pkg_jobs.c.orig	2019-09-18 07:11:10 UTC
-+++ libpkg/pkg_jobs.c
-@@ -74,7 +74,7 @@ struct pkg_jobs_locked {
- 	int (*locked_pkg_cb)(struct pkg *, void *);
- 	void *context;
- };
--static __thread struct pkg_jobs_locked *pkgs_job_lockedpkg;
-+static struct pkg_jobs_locked *pkgs_job_lockedpkg;
- 
- #define IS_DELETE(j) ((j)->type == PKG_JOBS_DEINSTALL || (j)->type == PKG_JOBS_AUTOREMOVE)
-