diff --git a/devel/nanopb/Makefile b/devel/nanopb/Makefile
index 2f75088c322f..8491ca65ad96 100644
--- a/devel/nanopb/Makefile
+++ b/devel/nanopb/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	nanopb
 DISTVERSION=	0.4.6.4-3
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gf84ad7f
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Protocol Buffers with small code size
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	protoc:devel/protobuf
 TEST_DEPENDS=	scons:devel/scons
 
 USES=		cmake python shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	generator/nanopb_generator.py
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} # only for tests
 
 do-test:
 	@cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} scons LINKLIBS=-lm
 
 .include <bsd.port.mk>
diff --git a/devel/nanopb/files/patch-pb.h b/devel/nanopb/files/patch-pb.h
new file mode 100644
index 000000000000..1dbd1f6f6e79
--- /dev/null
+++ b/devel/nanopb/files/patch-pb.h
@@ -0,0 +1,11 @@
+--- pb.h.orig	2022-07-03 17:53:31 UTC
++++ pb.h
+@@ -11,7 +11,7 @@
+  *****************************************************************/
+ 
+ /* Enable support for dynamically allocated fields */
+-/* #define PB_ENABLE_MALLOC 1 */
++#define PB_ENABLE_MALLOC 1
+ 
+ /* Define this if your CPU / compiler combination does not support
+  * unaligned memory access to packed structures. Note that packed