diff --git a/devel/nanopb/Makefile b/devel/nanopb/Makefile
index d0cb81b91271..70567b29b752 100644
--- a/devel/nanopb/Makefile
+++ b/devel/nanopb/Makefile
@@ -1,36 +1,43 @@
 PORTNAME=	nanopb
 DISTVERSION=	0.4.8
+PORTREVISION=	1
 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 \
 		${PY_SETUPTOOLS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		${PY_SETUPTOOLS} # for the pkg_resources package
 TEST_DEPENDS=	scons:devel/scons
 
 USES=		cmake python shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	generator/nanopb_generator \
 		generator/nanopb_generator.py \
 		extra/script_wrappers/nanopb_generator.py.in \
 		generator/protoc-gen-nanopb
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} # only for tests
 
+post-install:
+	${PYTHON_CMD} -m compileall -d ${PREFIX}/bin -f ${STAGEDIR}${PREFIX}/bin
+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} -f ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${PYTHON_CMD} -O -m compileall -d ${PREFIX}/bin -f ${STAGEDIR}${PREFIX}/bin
+	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} -f ${STAGEDIR}${PYTHON_SITELIBDIR}
+
 do-test:
 	@cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} scons LINKLIBS=-lm
 
 .include <bsd.port.mk>
diff --git a/devel/nanopb/pkg-plist b/devel/nanopb/pkg-plist
index 0b29c100778a..8015a0a1967a 100644
--- a/devel/nanopb/pkg-plist
+++ b/devel/nanopb/pkg-plist
@@ -1,21 +1,35 @@
+bin/__pycache__/nanopb_generator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+bin/__pycache__/nanopb_generator%%PYTHON_EXT_SUFFIX%%.pyc
 bin/nanopb_generator
 bin/nanopb_generator.py
 bin/protoc-gen-nanopb
 include/nanopb/pb.h
 include/nanopb/pb_common.h
 include/nanopb/pb_decode.h
 include/nanopb/pb_encode.h
 lib/cmake/nanopb/nanopb-config-version.cmake
 lib/cmake/nanopb/nanopb-config.cmake
 lib/cmake/nanopb/nanopb-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/nanopb/nanopb-targets.cmake
 lib/libprotobuf-nanopb.a
 lib/libprotobuf-nanopb.so
 lib/libprotobuf-nanopb.so.0
 %%PYTHON_SITELIBDIR%%/nanopb/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/nanopb/generator/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/__pycache__/nanopb_generator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/__pycache__/nanopb_generator%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/nanopb/generator/nanopb_generator.py
 %%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__init__.py
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/nanopb_pb2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/nanopb/generator/proto/__pycache__/nanopb_pb2%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/nanopb/generator/proto/_utils.py
 %%PYTHON_SITELIBDIR%%/nanopb/generator/proto/nanopb.proto
 %%PYTHON_SITELIBDIR%%/nanopb/generator/proto/nanopb_pb2.py