diff --git a/devel/nanopb/Makefile b/devel/nanopb/Makefile
index 67af1baaf866..852311b14d47 100644
--- a/devel/nanopb/Makefile
+++ b/devel/nanopb/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	nanopb
-DISTVERSION=	0.4.6.4-3
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-gf84ad7f
+DISTVERSION=	0.4.7
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Protocol Buffers with small code size
 WWW=		https://jpa.kapsi.fi/nanopb/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	protoc:devel/protobuf
+BUILD_DEPENDS=	protoc:devel/protobuf \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
 TEST_DEPENDS=	scons:devel/scons
 
 USES=		cmake python shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
-SHEBANG_FILES=	generator/nanopb_generator.py
+SHEBANG_FILES=	generator/nanopb_generator.py generator/protoc-gen-nanopb
 
 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/distinfo b/devel/nanopb/distinfo
index 2296476a0cbf..b26af6965ddb 100644
--- a/devel/nanopb/distinfo
+++ b/devel/nanopb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656866213
-SHA256 (nanopb-nanopb-0.4.6.4-3-gf84ad7f_GH0.tar.gz) = b67ce9e7f65dd6d9d0c48ceaab2f382604068828ed6d990307707fae9343ceee
-SIZE (nanopb-nanopb-0.4.6.4-3-gf84ad7f_GH0.tar.gz) = 1136772
+TIMESTAMP = 1670903657
+SHA256 (nanopb-nanopb-0.4.7_GH0.tar.gz) = e1d89b166367a3c42d42311bdc2ed57ff78f86aede9a66828516e45490d48c81
+SIZE (nanopb-nanopb-0.4.7_GH0.tar.gz) = 1154419