diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 3316f9efc498..684b6dd5eed4 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -1,83 +1,85 @@
 PORTNAME=	grpc
 PORTVERSION=	1.65.4
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
 WWW=		https://grpc.io/ \
 		https://github.com/grpc/grpc
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	abseil>=20240116.0:devel/abseil \
 		xxhash>=0:devel/xxhash
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbenchmark.so:devel/benchmark \
 		libcares.so:dns/c-ares \
 		libopentelemetry_common.so:devel/opentelemetry-cpp \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl
 
 USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 \
 		-DgRPC_ABSL_PROVIDER=package \
 		-DgRPC_BENCHMARK_PROVIDER=package \
 		-DgRPC_CARES_PROVIDER=package \
 		-DgRPC_OPENTELEMETRY_PROVIDER=package \
 		-DgRPC_PROTOBUF_PROVIDER=package \
 		-DgRPC_RE2_PROVIDER=package \
 		-DgRPC_SSL_PROVIDER=package \
 		-DgRPC_ZLIB_PROVIDER=package
 CMAKE_OFF=	CMAKE_CXX_EXTENSIONS \
 		gRPC_BUILD_TESTS \
 		gRPC_DOWNLOAD_ARCHIVES
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		gRPC_BUILD_CODEGEN \
 		gRPC_BUILD_GRPC_CPP_PLUGIN \
 		gRPC_BUILD_GRPC_CSHARP_PLUGIN \
 		gRPC_BUILD_GRPC_NODE_PLUGIN \
 		gRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN \
 		gRPC_BUILD_GRPC_PHP_PLUGIN \
 		gRPC_BUILD_GRPC_PYTHON_PLUGIN \
 		gRPC_BUILD_GRPC_RUBY_PLUGIN
 USE_CSTD=	c11
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		SHLIB_VER=${PORTVERSION:R}
 
 CONFLICTS_INSTALL=	grpc[0-9][0-9][0-9]
 
 # Clean up bundled libraries
 .if !defined(MAINTAINER_MODE)
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/third_party/abseil-cpp/ \
 			--exclude ${DISTNAME}/third_party/benchmark/ \
 			--exclude ${DISTNAME}/third_party/boringssl-with-bazel/ \
 			--exclude ${DISTNAME}/third_party/cares/ \
 			--exclude ${DISTNAME}/third_party/protobuf/ \
 			--exclude ${DISTNAME}/third_party/re2/ \
+			--exclude ${DISTNAME}/third_party/upb/ \
+			--exclude ${DISTNAME}/third_party/utf8_range/ \
 			--exclude ${DISTNAME}/third_party/xxhash/ \
 			--exclude ${DISTNAME}/third_party/zlib/ \
 			--no-same-owner --no-same-permissions
 .else
 post-patch:
 	@${RM} -r ${WRKSRC}/third_party/abseil-cpp/
 	@${RM} -r ${WRKSRC}/third_party/benchmark/
 	@${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/
 	@${RM} -r ${WRKSRC}/third_party/cares/
 	@${RM} -r ${WRKSRC}/third_party/protobuf/
 	@${RM} -r ${WRKSRC}/third_party/re2/
-	#@${RM} -r ${WRKSRC}/third_party/upb/
-	#@${RM} -r ${WRKSRC}/third_party/utf8_range/
+	@${RM} -r ${WRKSRC}/third_party/upb/
+	@${RM} -r ${WRKSRC}/third_party/utf8_range/
 	@${RM} -r ${WRKSRC}/third_party/xxhash/
 	@${RM} -r ${WRKSRC}/third_party/zlib/
 .endif
 
 .include <bsd.port.mk>