diff --git a/www/node20/Makefile b/www/node20/Makefile
index e19d21e16b8e..a80e7531f69c 100644
--- a/www/node20/Makefile
+++ b/www/node20/Makefile
@@ -1,111 +1,114 @@
 PORTNAME=	node
 PORTVERSION=	${NODEJS_PORTVERSION}
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	${PORTVERSION:R:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 WWW=		https://nodejs.org/ \
 		https://github.com/nodejs/node
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	objdump:devel/binutils
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libcares.so:dns/c-ares \
 		libicui18n.so:devel/icu \
 		libllhttp.so:www/llhttp \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
 		libngtcp2.so:net/libngtcp2 \
 		libsimdjson.so:devel/simdjson \
 		libuv.so:devel/libuv
+RUN_DEPENDS=	corepack>=0:www/corepack
 
 USES=		compiler:c++11-lang gmake localbase pkgconfig python:build shebangfix tar:xz
 
 CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
 		--shared-brotli \
 		--shared-cares \
 		--shared-http-parser \
 		--shared-http-parser-libname=llhttp \
 		--shared-libuv \
 		--shared-nghttp2 \
 		--shared-nghttp3 \
 		--shared-ngtcp2 \
 		--shared-simdjson \
 		--shared-zlib \
+		--without-corepack \
 		--with-intl=system-icu \
 		--without-npm
 CXXFLAGS_powerpc64=	-mpower8-vector
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CC.host="${CCACHE_BIN} ${CC}" \
 		CFLAGS.host="${CFLAGS}" \
 		CXX.host="${CCACHE_BIN} ${CXX}" \
 		CXXFLAGS.host="${CXXFLAGS}" \
 		LDFLAGS.host="${LDFLAGS}" \
 		LINK.host="${CXX}"
 REINPLACE_ARGS=	-i ''
 
 CONFLICTS_INSTALL=	node[0-9][0-9]
 
 SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \
 		deps/v8/tools/*.py \
 		tools/*.py \
 		tools/inspector_protocol/*.py
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS JIT
 OPTIONS_DEFAULT=JIT
 OPTIONS_SUB=	yes
 BUNDLED_SSL_DESC=	Use bundled OpenSSL implementation from node.js
 JIT_DESC=		Use Just In Time compiler
 
 BUNDLED_SSL_CONFIGURE_OFF=	--openssl-use-def-ca-store --shared-openssl
 BUNDLED_SSL_RUN_DEPENDS_OFF=	ca_root_nss>=0:security/ca_root_nss
 BUNDLED_SSL_USES_OFF=	ssl
 JIT_CONFIGURE_OFF=	--v8-lite-mode
 
 .include "Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/deps/brotli/
 	@${RM} -r ${WRKSRC}/deps/cares/
+	@${RM} -r ${WRKSRC}/deps/corepack/
 	@${RM} -r ${WRKSRC}/deps/icu-small/
 	@${RM} -r ${WRKSRC}/deps/llhttp/
 	@${RM} -r ${WRKSRC}/deps/nghttp2/
 	@${RM} -r ${WRKSRC}/deps/ngtcp2/
 	@${RM} -r ${WRKSRC}/deps/npm/
 	@${RM} -r ${WRKSRC}/deps/simdjson/
 	@${RM} -r ${WRKSRC}/deps/uv/
 	@${RM} -r ${WRKSRC}/deps/zlib/
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase # above will ensure that we pick up includes for real
 	# external dependencies.
 	${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 post-install-BUNDLED_SSL-on:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} include/node/openssl/ -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/node20/pkg-plist b/www/node20/pkg-plist
index cc8253c32c83..044aeefcbfe5 100644
--- a/www/node20/pkg-plist
+++ b/www/node20/pkg-plist
@@ -1,164 +1,109 @@
-bin/corepack
 bin/node
 include/node/common.gypi
 include/node/config.gypi
 include/node/cppgc/allocation.h
 include/node/cppgc/common.h
 include/node/cppgc/cross-thread-persistent.h
 include/node/cppgc/custom-space.h
 include/node/cppgc/default-platform.h
 include/node/cppgc/ephemeron-pair.h
 include/node/cppgc/explicit-management.h
 include/node/cppgc/garbage-collected.h
 include/node/cppgc/heap-consistency.h
 include/node/cppgc/heap-handle.h
 include/node/cppgc/heap-state.h
 include/node/cppgc/heap-statistics.h
 include/node/cppgc/heap.h
 include/node/cppgc/internal/api-constants.h
 include/node/cppgc/internal/atomic-entry-flag.h
 include/node/cppgc/internal/base-page-handle.h
 include/node/cppgc/internal/caged-heap-local-data.h
 include/node/cppgc/internal/caged-heap.h
 include/node/cppgc/internal/compiler-specific.h
 include/node/cppgc/internal/finalizer-trait.h
 include/node/cppgc/internal/gc-info.h
 include/node/cppgc/internal/logging.h
 include/node/cppgc/internal/member-storage.h
 include/node/cppgc/internal/name-trait.h
 include/node/cppgc/internal/persistent-node.h
 include/node/cppgc/internal/pointer-policies.h
 include/node/cppgc/internal/write-barrier.h
 include/node/cppgc/liveness-broker.h
 include/node/cppgc/macros.h
 include/node/cppgc/member.h
 include/node/cppgc/name-provider.h
 include/node/cppgc/object-size-trait.h
 include/node/cppgc/persistent.h
 include/node/cppgc/platform.h
 include/node/cppgc/prefinalizer.h
 include/node/cppgc/process-heap-statistics.h
 include/node/cppgc/sentinel-pointer.h
 include/node/cppgc/source-location.h
 include/node/cppgc/testing.h
 include/node/cppgc/trace-trait.h
 include/node/cppgc/type-traits.h
 include/node/cppgc/visitor.h
 include/node/js_native_api.h
 include/node/js_native_api_types.h
 include/node/libplatform/libplatform-export.h
 include/node/libplatform/libplatform.h
 include/node/libplatform/v8-tracing.h
 include/node/node.h
 include/node/node_api.h
 include/node/node_api_types.h
 include/node/node_buffer.h
 include/node/node_object_wrap.h
 include/node/node_version.h
 include/node/v8-array-buffer.h
 include/node/v8-callbacks.h
 include/node/v8-container.h
 include/node/v8-context.h
 include/node/v8-cppgc.h
 include/node/v8-data.h
 include/node/v8-date.h
 include/node/v8-debug.h
 include/node/v8-embedder-heap.h
 include/node/v8-embedder-state-scope.h
 include/node/v8-exception.h
 include/node/v8-extension.h
 include/node/v8-external.h
 include/node/v8-forward.h
 include/node/v8-function-callback.h
 include/node/v8-function.h
 include/node/v8-initialization.h
 include/node/v8-internal.h
 include/node/v8-isolate.h
 include/node/v8-json.h
 include/node/v8-local-handle.h
 include/node/v8-locker.h
 include/node/v8-maybe.h
 include/node/v8-memory-span.h
 include/node/v8-message.h
 include/node/v8-microtask-queue.h
 include/node/v8-microtask.h
 include/node/v8-object.h
 include/node/v8-persistent-handle.h
 include/node/v8-platform.h
 include/node/v8-primitive-object.h
 include/node/v8-primitive.h
 include/node/v8-profiler.h
 include/node/v8-promise.h
 include/node/v8-proxy.h
 include/node/v8-regexp.h
 include/node/v8-script.h
 include/node/v8-snapshot.h
 include/node/v8-statistics.h
 include/node/v8-template.h
 include/node/v8-traced-handle.h
 include/node/v8-typed-array.h
 include/node/v8-unwinder.h
 include/node/v8-value-serializer.h
 include/node/v8-value.h
 include/node/v8-version.h
 include/node/v8-wasm.h
 include/node/v8-weak-callback-info.h
 include/node/v8.h
 include/node/v8config.h
-lib/node_modules/corepack/CHANGELOG.md
-lib/node_modules/corepack/LICENSE.md
-lib/node_modules/corepack/README.md
-lib/node_modules/corepack/dist/corepack.js
-lib/node_modules/corepack/dist/lib/corepack.cjs
-lib/node_modules/corepack/dist/npm.js
-lib/node_modules/corepack/dist/npx.js
-lib/node_modules/corepack/dist/pnpm.js
-lib/node_modules/corepack/dist/pnpx.js
-lib/node_modules/corepack/dist/yarn.js
-lib/node_modules/corepack/dist/yarnpkg.js
-lib/node_modules/corepack/package.json
-lib/node_modules/corepack/shims/corepack
-lib/node_modules/corepack/shims/corepack.cmd
-lib/node_modules/corepack/shims/corepack.ps1
-lib/node_modules/corepack/shims/nodewin/corepack
-lib/node_modules/corepack/shims/nodewin/corepack.cmd
-lib/node_modules/corepack/shims/nodewin/corepack.ps1
-lib/node_modules/corepack/shims/nodewin/npm
-lib/node_modules/corepack/shims/nodewin/npm.cmd
-lib/node_modules/corepack/shims/nodewin/npm.ps1
-lib/node_modules/corepack/shims/nodewin/npx
-lib/node_modules/corepack/shims/nodewin/npx.cmd
-lib/node_modules/corepack/shims/nodewin/npx.ps1
-lib/node_modules/corepack/shims/nodewin/pnpm
-lib/node_modules/corepack/shims/nodewin/pnpm.cmd
-lib/node_modules/corepack/shims/nodewin/pnpm.ps1
-lib/node_modules/corepack/shims/nodewin/pnpx
-lib/node_modules/corepack/shims/nodewin/pnpx.cmd
-lib/node_modules/corepack/shims/nodewin/pnpx.ps1
-lib/node_modules/corepack/shims/nodewin/yarn
-lib/node_modules/corepack/shims/nodewin/yarn.cmd
-lib/node_modules/corepack/shims/nodewin/yarn.ps1
-lib/node_modules/corepack/shims/nodewin/yarnpkg
-lib/node_modules/corepack/shims/nodewin/yarnpkg.cmd
-lib/node_modules/corepack/shims/nodewin/yarnpkg.ps1
-lib/node_modules/corepack/shims/npm
-lib/node_modules/corepack/shims/npm.cmd
-lib/node_modules/corepack/shims/npm.ps1
-lib/node_modules/corepack/shims/npx
-lib/node_modules/corepack/shims/npx.cmd
-lib/node_modules/corepack/shims/npx.ps1
-lib/node_modules/corepack/shims/pnpm
-lib/node_modules/corepack/shims/pnpm.cmd
-lib/node_modules/corepack/shims/pnpm.ps1
-lib/node_modules/corepack/shims/pnpx
-lib/node_modules/corepack/shims/pnpx.cmd
-lib/node_modules/corepack/shims/pnpx.ps1
-lib/node_modules/corepack/shims/yarn
-lib/node_modules/corepack/shims/yarn.cmd
-lib/node_modules/corepack/shims/yarn.ps1
-lib/node_modules/corepack/shims/yarnpkg
-lib/node_modules/corepack/shims/yarnpkg.cmd
-lib/node_modules/corepack/shims/yarnpkg.ps1
 %%PORTDOCS%%%%DOCSDIR%%/gdbinit
 %%PORTDOCS%%%%DOCSDIR%%/lldb_commands.py
 @(,,444) share/man/man1/node.1.gz