diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile
index d189618f6d09..b35e035b5647 100644
--- a/devel/grpc142/Makefile
+++ b/devel/grpc142/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	grpc
 PORTVERSION=	1.42.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	5
 CATEGORIES=	devel
 PKGNAMESUFFIX=	142
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
 WWW=		https://grpc.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbenchmark.so:devel/benchmark \
 		libcares.so:dns/c-ares \
 		libgflags.so:devel/gflags \
 		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_GFLAGS_PROVIDER=package \
 		-DgRPC_PROTOBUF_PROVIDER=package \
 		-DgRPC_RE2_PROVIDER=package \
 		-DgRPC_SSL_PROVIDER=package \
 		-DgRPC_ZLIB_PROVIDER=package
 CMAKE_ON=	BUILD_SHARED_LIBS
+LDFLAGS+=	-labsl_hash -labsl_raw_hash_set
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHLIB_MAJOR=${PORTVERSION:R} \
 		SHLIB_MINOR=${PORTVERSION:E}
 
 CONFLICTS_INSTALL=	grpc130 grpc134 grpc
 
 .include <bsd.port.pre.mk>
 
 # Remove openssl from grpc.pc because we do not ship openssl.pc in base system
 .if ${SSL_DEFAULT} == base
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif
 
 post-patch:
 # Clean up bundled libraries
 	@${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/zlib/
 
 .include <bsd.port.post.mk>
diff --git a/devel/grpc142/files/patch-protobuf b/devel/grpc142/files/patch-protobuf
new file mode 100644
index 000000000000..5367f513a01d
--- /dev/null
+++ b/devel/grpc142/files/patch-protobuf
@@ -0,0 +1,66 @@
+--- CMakeLists.txt.orig	2021-11-16 23:39:48 UTC
++++ CMakeLists.txt
+@@ -191,7 +191,7 @@ endif()
+ 
+ # Add c++11 flags
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
+-  set(CMAKE_CXX_STANDARD 11)
++  set(CMAKE_CXX_STANDARD 17)
+ else()
+   if (CMAKE_CXX_STANDARD LESS 11)
+     message(FATAL_ERROR "CMAKE_CXX_STANDARD is less than 11, please specify at least SET(CMAKE_CXX_STANDARD 11)")
+--- src/compiler/config_protobuf.h.orig	2021-11-16 23:39:48 UTC
++++ src/compiler/config_protobuf.h
+@@ -50,7 +50,7 @@
+ #endif
+ 
+ #ifndef GRPC_CUSTOM_CSHARP_GETCLASSNAME
+-#include <google/protobuf/compiler/csharp/csharp_names.h>
++#include <google/protobuf/compiler/csharp/names.h>
+ #define GRPC_CUSTOM_CSHARP_GETCLASSNAME \
+   ::google::protobuf::compiler::csharp::GetClassName
+ #define GRPC_CUSTOM_CSHARP_GETFILENAMESPACE \
+--- src/compiler/objective_c_generator.cc.orig	2021-11-16 23:39:48 UTC
++++ src/compiler/objective_c_generator.cc
+@@ -22,7 +22,7 @@
+ #include <set>
+ #include <sstream>
+ 
+-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
++#include <google/protobuf/compiler/objectivec/names.h>
+ 
+ #include "src/compiler/config.h"
+ #include "src/compiler/objective_c_generator_helpers.h"
+--- src/compiler/objective_c_generator_helpers.h.orig	2021-11-16 23:39:48 UTC
++++ src/compiler/objective_c_generator_helpers.h
+@@ -21,7 +21,7 @@
+ 
+ #include <map>
+ 
+-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
++#include <google/protobuf/compiler/objectivec/names.h>
+ 
+ #include "src/compiler/config.h"
+ #include "src/compiler/generator_helpers.h"
+--- src/compiler/objective_c_plugin.cc.orig	2021-11-16 23:39:48 UTC
++++ src/compiler/objective_c_plugin.cc
+@@ -20,7 +20,7 @@
+ 
+ #include <memory>
+ 
+-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
++#include <google/protobuf/compiler/objectivec/names.h>
+ 
+ #include "src/compiler/config.h"
+ #include "src/compiler/objective_c_generator.h"
+--- include/grpcpp/impl/codegen/config_protobuf.h.orig	2021-11-16 23:39:48 UTC
++++ include/grpcpp/impl/codegen/config_protobuf.h
+@@ -69,7 +69,7 @@
+ #include <google/protobuf/util/json_util.h>
+ #include <google/protobuf/util/type_resolver_util.h>
+ #define GRPC_CUSTOM_JSONUTIL ::google::protobuf::util
+-#define GRPC_CUSTOM_UTIL_STATUS ::google::protobuf::util::Status
++#define GRPC_CUSTOM_UTIL_STATUS ::absl::Status
+ #endif
+ 
+ namespace grpc {