diff --git a/devel/py-grpcio-tools/Makefile b/devel/py-grpcio-tools/Makefile
index 0deb8be1330f..9c1659a5ae45 100644
--- a/devel/py-grpcio-tools/Makefile
+++ b/devel/py-grpcio-tools/Makefile
@@ -1,25 +1,25 @@
 # Created by: vanilla@
 
 PORTNAME=	grpcio-tools
-PORTVERSION=	1.36.1
+PORTVERSION=	1.37.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Protobuf code generator for gRPC
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio@${PY_FLAVOR}
 LIB_DEPENDS=	libcares.so:dns/c-ares
 
 USES=		compiler:c++11-lang localbase:ldflags python:3.5+
 USE_PYTHON=	autoplist distutils
 CFLAGS+=	-DHAVE_PTHREAD=1
 LDFLAGS+=	-lcares
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc_tools/_protoc_compiler*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-grpcio-tools/distinfo b/devel/py-grpcio-tools/distinfo
index 39443485cb03..5c454cba5fb9 100644
--- a/devel/py-grpcio-tools/distinfo
+++ b/devel/py-grpcio-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614918785
-SHA256 (grpcio-tools-1.36.1.tar.gz) = 80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6
-SIZE (grpcio-tools-1.36.1.tar.gz) = 2118932
+TIMESTAMP = 1618022759
+SHA256 (grpcio-tools-1.37.0.tar.gz) = 3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c
+SIZE (grpcio-tools-1.37.0.tar.gz) = 2120358
diff --git a/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_io_coded__stream.h b/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_io_coded__stream.h
new file mode 100644
index 000000000000..15283972c1bc
--- /dev/null
+++ b/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_io_coded__stream.h
@@ -0,0 +1,11 @@
+--- third_party/protobuf/src/google/protobuf/io/coded_stream.h.orig	2021-04-10 02:54:14 UTC
++++ third_party/protobuf/src/google/protobuf/io/coded_stream.h
+@@ -131,7 +131,7 @@
+ #pragma runtime_checks("c", off)
+ #endif
+ #else
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <machine/endian.h>  // __BYTE_ORDER
+ #else
+ #include <endian.h>  // __BYTE_ORDER
diff --git a/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_stubs_port.h b/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_stubs_port.h
new file mode 100644
index 000000000000..1c2591d13e2e
--- /dev/null
+++ b/devel/py-grpcio-tools/files/patch-third__party_protobuf_src_google_protobuf_stubs_port.h
@@ -0,0 +1,11 @@
+--- third_party/protobuf/src/google/protobuf/stubs/port.h.orig	2021-04-10 02:52:06 UTC
++++ third_party/protobuf/src/google/protobuf/stubs/port.h
+@@ -57,7 +57,7 @@
+ #pragma runtime_checks("c", off)
+ #endif
+ #else
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <machine/endian.h>  // __BYTE_ORDER
+ #else
+ #include <endian.h>  // __BYTE_ORDER